merge-conflicts
merge-conflicts copied to clipboard
smashwilson
Resolve git merge conflicts in Atom
[Enter steps to reproduce below:] 1. ... 2. ... **Atom Version**: 1.6.0 **System**: Mac OS X 10.11.3 **Thrown From**: [merge-conflicts](https://github.com/smashwilson/merge-conflicts) package, v1.3.7 ### Stack Trace Uncaught TypeError: Cannot read property...
The conflict headers overlay the list of conflicts when scrolling.  Using Atom v1.0.19 Merge Conflicts v1.3.6
It refuses to show when going to the next file. Have to quit the merge conflicts panel, and then find merge conflicts again with the relevant file open before it...
Git has built in support for interfacing with external merge tools. We should add support for that: https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration#External-Merge-and-Diff-Tools
When I open the file, UI appears for a moment, but then disappears. 
[Enter steps to reproduce below:] **Atom Version**: 1.0.19 **System**: Ubuntu 14.04.4 **Thrown From**: [merge-conflicts](https://github.com/smashwilson/merge-conflicts) package, v1.3.7 ### Stack Trace Failed to activate the merge-conflicts package ``` At Cannot find module...
`atom.project.getRepositories()` is fundamentally broken as an atom feature since it demands the user to load each git project as the top most directory. If you have many repositories and prefer...
 After selecting 1 of the two version available for a conflict, I pressed the stage button for the current file. I received...
Unlock [achievements](https://github.com/rgbkrk/atom-achievements) when users finish particular actions. Some ideas: - Finishing their first merge "Maybe now they'll finally accept your PR" - Merging X hunks "You are a noble git...
The "our changes" and "their changes" grey text is too hard to see against the blue or especially green backgrounds, making it tricky to read. This makes it hard to...
