issues
search
smashwilson
/
merge-conflicts
Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
431
stars
42
forks
source link
issues
Newest
Newest
Most commented
Recently updated
Oldest
Least commented
Least recently updated
Deprecation notice
#273
smashwilson
closed
7 years ago
0
Add setting to skip stage
#272
gunnan99
opened
7 years ago
0
Support custom project path for conflict detection
#271
yanfeng42
closed
2 years ago
0
Search for conflicts only restricted to a subfolder
#270
red-moss2
opened
7 years ago
1
Add option to keep both changes
#269
douglascamata
opened
7 years ago
2
Uncaught Error: Can't save destroyed buffer
#268
guilhermejcgois
closed
7 years ago
2
Navigation between distant conflicts in a single file?
#267
CodeMan99
opened
7 years ago
1
[Feature Request] Minimap Plugin?
#266
r0ckarong
opened
7 years ago
1
Fixes deprecation call to assign custom properties to a marker #262
#265
dbachko
closed
7 years ago
1
Overlapping
#264
jacopocarlini
opened
7 years ago
1
No conflicts detected.
#263
nobleach
closed
7 years ago
4
Function.extractParams is deprecated.
#262
coolamit1240
opened
7 years ago
23
Colored Conflict Bars display over other panels
#261
rpennell
opened
7 years ago
1
Notification of stage locks file
#260
rpennell
opened
7 years ago
1
Cannot read property 'registerContextApi' of undefined
#259
iki
opened
7 years ago
1
Request: Add option to auto-stage
#258
vprigent
opened
7 years ago
0
Request: Add support for mini-map
#257
jolsen71
opened
7 years ago
1
UI conflicts with tree view when docked on the right side
#256
mikemerritt
opened
7 years ago
5
Document Shortcut for Detect Merge Conflicts in Menu Entry
#255
kiryph
opened
7 years ago
1
Function.extractParams is deprecated.
#254
mikemcbride
closed
7 years ago
4
Uncaught Error: Failed to rename lockfile to '/Volumes/Dev2/melijoe/.git/index': Resource busy
#253
l-landier
opened
7 years ago
1
Line inserted just after marker is not treated as body
#252
ypresto
opened
8 years ago
1
Headers break out of the file's pane
#251
kevinansfield
closed
7 years ago
2
Theme with large buttons hides conflict's first line
#250
mateosss
closed
7 years ago
6
Fix diff3 markers
#249
sergeysova
opened
8 years ago
5
Fix merge base marker is not removed on quit
#248
ypresto
closed
7 years ago
1
Side-by-side diff for each conflicting change sets
#247
ypresto
opened
8 years ago
3
Conflict resolution popup messages should include the file name in the message rather than just 'this file'.
#246
peterhal
opened
8 years ago
1
Added installation instructions to readme
#245
amilajack
closed
8 years ago
1
Keep both?
#244
jglovier
closed
8 years ago
4
Nothing to merge
#243
ayberkozgur
opened
8 years ago
6
Uncaught Error: Cannot decorate a destroyed marker
#242
PierreGUI
closed
7 years ago
2
Uninstalling “merge-conflicts” failed
#241
miclaus
closed
8 years ago
1
Doesn't work with the 'Seti' theme
#240
RigoOnRails
opened
8 years ago
6
UI showing on top of Atom's footer bar
#239
adamreisnz
opened
8 years ago
1
Uncaught TypeError: Illegal invocation
#238
50Wliu
opened
8 years ago
5
Custom repository contexts: show, hide, complete, quit and multi-context projects
#237
mostafaeweda
closed
8 years ago
4
Normalize paths coming from git
#236
aroig
closed
8 years ago
3
Avoid "Use me" <atom-overlay> to scroll over conflicts panel
#235
orioltf
closed
8 years ago
3
Stage popup button does nothing/cannot be dismissed
#234
rzeigler
opened
8 years ago
2
merge-conflicts package fails to load on Atom start up
#233
web-snake
closed
8 years ago
2
feature request: keep both
#232
keyboSlice
closed
8 years ago
1
Failed to load the merge-conflicts package
#231
MattRiesterer
closed
8 years ago
9
Documentation on key binding customization.
#230
smashwilson
closed
8 years ago
1
Refactor the Conflict parser.
#229
smashwilson
closed
8 years ago
0
Conflict detection doesn't work if no conflict in the first project folder on 1.4.x
#228
emileber
closed
7 years ago
2
Conflict resolution controls doesn't appear with 1.4.x
#227
emileber
closed
8 years ago
12
Code editor overlay
#226
tn
closed
8 years ago
1
Marks wrong lines on diff3 without base content
#225
ypresto
closed
8 years ago
2
UI disappears
#224
irudoy
opened
8 years ago
1
Next