Resolve git merge conflicts in Atom
-
Updated
May 16, 2017 - CoffeeScript
#
merge-conflicts
Here is 1 public repository matching this topic...
Improve this page
Add a description, image, and links to the merge-conflicts topic page so that developers can more easily learn about it.
Add this topic to your repo
To associate your repository with the merge-conflicts topic, visit your repo's landing page and select "manage topics."