Skip to content

Commit

Permalink
add note about where to click for the ide walkthroughs
Browse files Browse the repository at this point in the history
  • Loading branch information
Briana Swift committed Dec 7, 2017
1 parent 20f0602 commit 825c003
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion paths/merge-conflict/07-ide-intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ header:
overlay_filter: rgba(46, 129, 200, 0.6)
title: Using GUIs to Handle Merge Conflicts
permalink: /merge-conflicts/ide-intro/
next-page: /merge-conflicts/ide-atom/
sidebar:
nav: "merge-conflicts"
main-content: |
Although we were able to resolve the merge conflicts we encountered in this course within the GitHub user interface, sometimes we need to resolve merge conflicts locally. This section is going to outline how merge conflicts can be resolved in text editors like [Atom](https://atom.io/) or [Visual Studio Code](https://code.visualstudio.com/) and Integrated Development Environments (IDEs) like [Visual Studio](https://www.visualstudio.com/) and [Eclipse](https://www.eclipse.org/ide/).
You can find links to these walkthroughs on the navigation bar in this course.
Have a favorite tool and want to add a guide on how to handle merge conflicts in it? Contribute to the [GitHub Training Kit](https://github.com/github/training-kit) repository.
---

0 comments on commit 825c003

Please sign in to comment.