Skip to content
This repository has been archived by the owner on Nov 8, 2017. It is now read-only.

Issues: smashwilson/merge-conflicts

64 Open 110 Closed
64 Open 110 Closed
Author
Filter by author
Loading
Label
Filter by label
Loading
Use alt + click/return to exclude labels
or ⇧ + click/return for logical OR
Projects
Filter by project
Loading
Milestones
Filter by milestone
Loading
Assignee
Filter by who’s assigned
Sort
Sort by
Newest Oldest Most commented Least commented Recently updated Least recently updated Best match
Most reactions
👍 👎 😄 🎉 😕 ❤️ 🚀 👀

Issues list

Search for conflicts only restricted to a subfolder
#270 opened Apr 27, 2017 by red-moss2
1
Add option to keep both changes
#269 opened Apr 20, 2017 by douglascamata
2
Navigation between distant conflicts in a single file?
#267 opened Apr 12, 2017 by CodeMan99
1
[Feature Request] Minimap Plugin?
#266 opened Apr 3, 2017 by r0ckarong
1
Overlapping
#264 opened Mar 25, 2017 by jacopocarlini
1
Function.extractParams is deprecated.
#262 opened Mar 7, 2017 by coolamit1240
23
Colored Conflict Bars display over other panels
#261 opened Feb 25, 2017 by rpennell
1
Notification of stage locks file
#260 opened Feb 25, 2017 by rpennell
1
Cannot read property 'registerContextApi' of undefined
#259 opened Jan 26, 2017 by iki
1
Request: Add option to auto-stage
#258 opened Dec 29, 2016 by vprigent
Request: Add support for mini-map
#257 opened Dec 16, 2016 by jolsen71
1
UI conflicts with tree view when docked on the right side
#256 opened Dec 6, 2016 by mikemerritt
5
Document Shortcut for Detect Merge Conflicts in Menu Entry
#255 opened Nov 29, 2016 by kiryph
1
Uncaught Error: Failed to rename lockfile to '/Volumes/Dev2/melijoe/.git/index': Resource busy
#253 opened Nov 9, 2016 by l-landier
1
Line inserted just after marker is not treated as body
#252 opened Sep 30, 2016 by ypresto
1
Fix diff3 markers
#249 opened Sep 17, 2016 by sergeysova
5
Side-by-side diff for each conflicting change sets enhancement
#247 opened Aug 19, 2016 by ypresto
3
Conflict resolution popup messages should include the file name in the message rather than just 'this file'.
#246 opened Aug 1, 2016 by peterhal
1
Nothing to merge
#243 opened Jun 24, 2016 by ayberkozgur
6
Doesn't work with the 'Seti' theme
#240 opened Jun 6, 2016 by RigoOnRails
6
UI showing on top of Atom's footer bar
#239 opened May 31, 2016 by adamreisnz
1
Uncaught TypeError: Illegal invocation
#238 opened May 26, 2016 by winstliu
5
Stage popup button does nothing/cannot be dismissed
#234 opened May 16, 2016 by rzeigler
2
UI disappears
#224 opened Apr 14, 2016 by irudoy
1
Uncaught Error: Failed to rename lockfile to '/Users/hernanezequielmartinez/Documents/workspace/l...
#218 opened Apr 1, 2016 by exemartinez
2
ProTip! no:milestone will show everything without a milestone.