smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

https://atom.io/packages/merge-conflicts

smashwilson/merge-conflicts Issues

Uncaught Error: Failed to rename lockfile to '/Users/hernanezequielmartinez/Documents/workspace/l...
Updated 7 years ago2
Theme with large buttons hides conflict's first line
Closed 7 years ago6
Uncaught Error: Can't save destroyed buffer
Closed 7 years ago2
Uncaught Error: Cannot decorate a destroyed marker
Closed 7 years ago2
Conflict detection doesn't work if no conflict in the first project folder on 1.4.x
Closed 7 years ago2
Stage popup button does nothing/cannot be dismissed
Updated 7 years ago2
Doesn't work with the 'Seti' theme
Updated 7 years ago6
Nothing to merge
Updated 7 years ago6
Conflict resolution popup messages should include the file name in the message rather than just 'this file'.
Updated 7 years ago1
Side-by-side diff for each conflicting change sets
Updated 7 years ago3
Fix diff3 markers
Updated 7 years ago5
Headers break out of the file's pane
Closed 7 years ago2
Line inserted just after marker is not treated as body
Updated 7 years ago1
Uncaught Error: Failed to rename lockfile to '/Volumes/Dev2/melijoe/.git/index': Resource busy
Updated 7 years ago1
Function.extractParams is deprecated.
Closed 7 years ago4
Document Shortcut for Detect Merge Conflicts in Menu Entry
Updated 7 years ago1
UI conflicts with tree view when docked on the right side
Updated 7 years ago5
Request: Add support for mini-map
Updated 7 years ago1
Cannot read property 'registerContextApi' of undefined
Updated 7 years ago1
Notification of stage locks file
Updated 7 years ago1
Colored Conflict Bars display over other panels
Updated 7 years ago1
Function.extractParams is deprecated.
Updated 7 years ago23
Overlapping
Updated 7 years ago1
[Feature Request] Minimap Plugin?
Updated 7 years ago1
Navigation between distant conflicts in a single file?
Updated 7 years ago1
Add option to keep both changes
Updated 7 years ago2
Search for conflicts only restricted to a subfolder
Updated 7 years ago1
No conflicts detected.
Closed 7 years ago4
Request: Add option to auto-stage
Updated 8 years ago
Uncaught TypeError: Illegal invocation
Updated 8 years ago5
Uninstalling “merge-conflicts” failed
Closed 8 years ago1
UI showing on top of Atom's footer bar
Updated 8 years ago1
Keep both?
Closed 8 years ago4
Uncaught TypeError: Cannot read property 'detect' of undefined
Updated 8 years ago2
Conflict resolution controls doesn't appear with 1.4.x
Closed 8 years ago12
merge-conflicts package fails to load on Atom start up
Closed 8 years ago2
feature request: keep both
Closed 8 years ago1
Failed to load the merge-conflicts package
Closed 8 years ago9
Marks wrong lines on diff3 without base content
Closed 8 years ago2
How Do I Personalize the keybinding?
Closed 8 years ago2
Allow use as a git merge tool
Updated 8 years ago1
Uncaught Error: spawn ENOTDIR
Closed 8 years ago1
UI disappears
Updated 8 years ago1
Failed to activate merge-conflicts package
Updated 8 years ago1
Code editor overlay
Closed 8 years ago1
In conflict resolution, branch name get over the rest if the UI.
Closed 8 years ago3
Finds conflicted files but no visual feedback
Closed 8 years ago3
Uncaught Error: Cannot find module 'space-pen'
Closed 8 years ago2
Breaks when used with atom-editorconfig
Closed 8 years ago1
Uncaught Error: The index is locked. This might be due to a concurrent or crashed process
Closed 8 years ago4