Issues
- 2
Uncaught Error: Failed to rename lockfile to '/Users/hernanezequielmartinez/Documents/workspace/l...
#218 opened by exemartinez - 6
Theme with large buttons hides conflict's first line
#250 opened by mateosss - 2
Uncaught Error: Can't save destroyed buffer
#268 opened by guilhermejcgois - 2
Uncaught Error: Cannot decorate a destroyed marker
#242 opened by PierreGUI - 2
Conflict detection doesn't work if no conflict in the first project folder on 1.4.x
#228 opened by emileber - 2
Stage popup button does nothing/cannot be dismissed
#234 opened by rzeigler - 6
Doesn't work with the 'Seti' theme
#240 opened by RigoOnRails - 6
Nothing to merge
#243 opened by ayberkozgur - 1
Conflict resolution popup messages should include the file name in the message rather than just 'this file'.
#246 opened by peterhal - 3
Side-by-side diff for each conflicting change sets
#247 opened by ypresto - 5
Fix diff3 markers
#249 opened by sergeysova - 2
Headers break out of the file's pane
#251 opened by kevinansfield - 1
- 1
Uncaught Error: Failed to rename lockfile to '/Volumes/Dev2/melijoe/.git/index': Resource busy
#253 opened by l-landier - 4
Function.extractParams is deprecated.
#254 opened by mikemcbride - 1
- 5
- 1
Request: Add support for mini-map
#257 opened by jolsen71 - 1
Cannot read property 'registerContextApi' of undefined
#259 opened by iki - 1
Notification of stage locks file
#260 opened by rpennell - 1
Colored Conflict Bars display over other panels
#261 opened by rpennell - 23
Function.extractParams is deprecated.
#262 opened by coolamit1240 - 1
Overlapping
#264 opened by jacopocarlini - 1
[Feature Request] Minimap Plugin?
#266 opened by r0ckarong - 1
- 2
Add option to keep both changes
#269 opened by douglascamata - 1
Search for conflicts only restricted to a subfolder
#270 opened by red-moss2 - 4
No conflicts detected.
#263 opened by nobleach - 0
Request: Add option to auto-stage
#258 opened by vprigent - 5
Uncaught TypeError: Illegal invocation
#238 opened by 50Wliu - 1
Uninstalling “merge-conflicts” failed
#241 opened by miclaus - 1
UI showing on top of Atom's footer bar
#239 opened by adamreisnz - 4
Keep both?
#244 opened by jglovier - 2
- 12
- 2
- 1
feature request: keep both
#232 opened by keyboSlice - 9
Failed to load the merge-conflicts package
#231 opened by MattRiesterer - 2
Marks wrong lines on diff3 without base content
#225 opened by ypresto - 2
How Do I Personalize the keybinding?
#214 opened by eltommy99 - 1
Allow use as a git merge tool
#213 opened by ChristopherKing42 - 1
Uncaught Error: spawn ENOTDIR
#217 opened by pierreglardon - 1
UI disappears
#224 opened by irudoy - 1
Failed to activate merge-conflicts package
#210 opened by Abhis3798 - 1
Code editor overlay
#226 opened by tn - 3
- 3
Finds conflicted files but no visual feedback
#223 opened by stevenbriscoeca - 2
Uncaught Error: Cannot find module 'space-pen'
#215 opened by creekpld - 1
Breaks when used with atom-editorconfig
#212 opened by simon-ls - 4
Uncaught Error: The index is locked. This might be due to a concurrent or crashed process
#211 opened by ToxEn