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
GitBridge.add expects a repo, not a path.
#173
smashwilson
closed
9 years ago
1
Use the next-unresolved binding from anywhere?
#172
bronson
opened
9 years ago
1
Git add failed: exit code 128 (solved by itself)
#171
UnconventionalMindset
opened
9 years ago
44
Scroll the individual conflict marker list.
#170
smashwilson
closed
9 years ago
1
Uncaught TypeError: undefined is not a function (Detect conflicts)
#169
maaarghk
closed
9 years ago
13
Uncaught TypeError: undefined is not a function
#168
Eschon
closed
9 years ago
6
Remove "marker" maintenance
#167
smashwilson
closed
9 years ago
0
nothing happening on Mac
#166
SirZach
closed
9 years ago
2
More multiple repository work.
#165
smashwilson
closed
9 years ago
0
Handle projects without git repositories
#164
smashwilson
closed
9 years ago
0
Correct the "git not found" error view
#163
smashwilson
closed
9 years ago
0
Use alt-M instead of ctrl-M in the keymap.
#162
smashwilson
closed
9 years ago
0
Uncaught TypeError: Cannot read property 'on' of undefined
#161
vparandii
closed
9 years ago
1
"Nothing to Merge" issue after a conflicting git rebase
#160
astorije
opened
9 years ago
9
Stage dropdown doesn't update when green "stage" button is pressed in conflicts summary
#159
aeslaughter
opened
9 years ago
0
Handle multiple git repositories
#158
benkahle
closed
9 years ago
2
Ctrl-M keybinding conflicts with matching bracket on windows and linux
#157
forivall
closed
9 years ago
4
Package.getStylesheetsPath is deprecated.
#156
cristianounix
closed
9 years ago
2
Package.getActivationCommands is deprecated.
#155
pavlo-yuriychuk
closed
9 years ago
2
Package.getStylesheetsPath is deprecated.
#154
pavlo-yuriychuk
closed
9 years ago
1
Package.activateResources is deprecated.
#153
pavlo-yuriychuk
closed
9 years ago
1
Refactoring
#152
smashwilson
closed
9 years ago
1
Notifications API
#151
smashwilson
closed
9 years ago
0
No conflicts detected, although there are.
#150
tdbs
closed
9 years ago
6
Undo changement
#149
lparmentier-quatral
opened
9 years ago
1
Uncaught TypeError: Cannot read property 'appendToTop' of undefined
#148
wchill
closed
9 years ago
3
Not working on windows
#147
cyrilchapon
closed
9 years ago
7
Apply clearfix to merge conflicts panel
#146
doryphores
closed
9 years ago
1
z-index issue with UI elements on horizontally split panes
#145
itsjustmath
closed
9 years ago
6
Compatibility with atom --one API preview mode.
#144
smashwilson
closed
9 years ago
0
Add option to ignore a conflict ("manual" mode)
#143
kankaristo
opened
9 years ago
3
Uncaught TypeError: Cannot read property 'findKeyBindings' of undefined
#142
westmark
closed
9 years ago
1
Buttons overlay each other in case of empty diff
#141
lazdmx
opened
9 years ago
0
Improve names
#140
smashwilson
closed
9 years ago
1
Implement a "why" button
#139
smashwilson
opened
9 years ago
5
Large merge conflict file list scrambles up screen
#138
elexx
closed
9 years ago
2
Wrong sort of arrows
#137
smashwilson
closed
9 years ago
0
Clean up resolved markers
#136
smashwilson
closed
9 years ago
0
Handle next or previous conflict navigation past the end
#135
smashwilson
closed
9 years ago
0
Expand conflict detection to support different files using git diff
#134
Arlanthir
opened
9 years ago
5
Uncaught TypeError: Cannot read property 'ours' of null
#133
mrkwse
closed
9 years ago
1
Fix deprecation warning
#132
Ingramz
closed
9 years ago
3
Merge-Conflicts Highlighted Text
#131
ahightman
closed
9 years ago
1
Failed to activate the merge-conflicts package
#130
AdamPohl
closed
9 years ago
2
Uncaught TypeError: Cannot read property 'getPath' of null
#129
nallie
closed
9 years ago
6
Uncaught Error: spawn EACCES
#128
wjn
closed
9 years ago
3
Show progress of conflicts being searched/detected
#127
jelmerdemaat
opened
9 years ago
2
Uncaught Error: This TextEditor has been destroyed
#126
akilhoffer
closed
9 years ago
1
Missed an arrow.
#125
smashwilson
closed
9 years ago
0
Don't attempt to decorate destroyed markers.
#124
smashwilson
closed
9 years ago
0
Previous
Next