Open Source Comes to Campus/Curriculum/Directory: Difference between revisions

There are a number of tools you can use to help visualize merge conflicts. For simple conflicts, though, I like to use a basic editor, such as nano, vim, emacs, or whatever you're most comfortable with. InTo basicview textthe viewmerge conflict, aopen the file that the merge conflict is in. In basic text view, it looks like this: