issues
search
smashwilson
/
merge-conflicts
Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432
stars
42
forks
source link
issues
Newest
Newest
Most commented
Recently updated
Oldest
Least commented
Least recently updated
Finds conflicted files but no visual feedback
#223
stevenbriscoeca
closed
8 years ago
3
Register custom repository contexts
#222
mostafaeweda
closed
8 years ago
3
Transact resolve() to group undo operation
#221
ypresto
closed
8 years ago
3
Fix hangs with broken conflict marker
#220
ypresto
closed
8 years ago
0
Add three-way merge markers support
#219
ypresto
closed
8 years ago
4
Uncaught Error: Failed to rename lockfile to '/Users/hernanezequielmartinez/Documents/workspace/l...
#218
exemartinez
opened
8 years ago
2
Uncaught Error: spawn ENOTDIR
#217
pierreglardon
closed
8 years ago
1
Uncaught TypeError: Cannot read property 'detect' of undefined
#216
hybrisCole
opened
8 years ago
2
Uncaught Error: Cannot find module 'space-pen'
#215
creekpld
closed
8 years ago
2
How Do I Personalize the keybinding?
#214
eltommy99
closed
8 years ago
2
Allow use as a git merge tool
#213
ChristopherKing42
opened
8 years ago
1
Breaks when used with atom-editorconfig
#212
simon-ls
closed
8 years ago
1
Uncaught Error: The index is locked. This might be due to a concurrent or crashed process
#211
ToxEn
closed
8 years ago
4
Failed to activate merge-conflicts package
#210
Abhis3798
opened
8 years ago
1
In conflict resolution, branch name get over the rest if the UI.
#209
Succo
closed
8 years ago
3
Merge conflicts interface disappears when going to next file
#208
adamreisnz
opened
8 years ago
5
[wip] Use block decorations for CoveringViews
#207
smashwilson
opened
8 years ago
2
Port to JavaScript and Etch
#206
smashwilson
opened
8 years ago
0
Use nodegit if available
#205
smashwilson
closed
8 years ago
0
Error when using merge-conflicts on files with Windows UNC path
#204
jolsen71
closed
8 years ago
1
Show some kind of "in progress" indicator for particular events
#203
ghost
closed
8 years ago
0
Doesn't work when EditorConfig is enabled
#202
ghost
closed
8 years ago
1
Unable to set Get Path in settings
#201
markcol
opened
8 years ago
1
[WIP] Add UI element for alternate resolution strategies like "Keep Both"
#200
al-the-x
opened
8 years ago
3
Any stage after first one fails with locked index error
#199
steelbrain
opened
8 years ago
2
Merge staging seems to do whole file replace instead of tracking hunks
#198
smiffy6969
opened
8 years ago
2
no longer finds conflicts
#197
SlimeQ
closed
8 years ago
1
Doesn't find merge conflicts tags in open file
#196
msheaver
opened
8 years ago
16
feat(cli): create git merge compatible mergetool script
#195
dudymas
closed
8 years ago
2
Uncaught Error: Failed to create locked file '.../.git/index.lock...
#194
averrin
closed
8 years ago
2
Uncaught Error: The index is locked. This might be due to a concurrent or crashed process
#193
grushetsky
closed
8 years ago
5
checkoutSide takes more arguments now.
#192
smashwilson
closed
8 years ago
0
Stage with git-utils
#191
smashwilson
closed
8 years ago
0
verticallyScrollable is no longer a thing
#190
smashwilson
closed
8 years ago
0
Does not work if top-level project is not a git repo.
#189
xiata
opened
8 years ago
6
Conflict header overlay positioning bug
#188
simonlayfield
opened
8 years ago
17
Uncaught TypeError: this.editor.verticallyScrollable is not a function
#187
averrin
closed
8 years ago
15
Uncaught TypeError: GitBridge.getActiveRepo is not a function
#186
nemccall
opened
8 years ago
3
Add a "Keep Both" strategy?
#185
al-the-x
opened
8 years ago
12
Insufficient contrast of the text on the blue and green conflict headers
#184
BrianHawley
opened
8 years ago
1
Going to next issue doesn't show UI
#183
seriema
opened
8 years ago
2
Uncaught TypeError: repo.getWorkingDirectory is not a function
#182
esetnik
closed
8 years ago
1
Fix selection highlight display
#181
antcodd
closed
8 years ago
2
Git cannot be found in any of the default locations
#180
adam-knights
opened
8 years ago
2
Resolve entire file throws Uncaught TypeError: undefined is not a function
#179
wolfgang42
opened
8 years ago
8
Include a how-to guide in the README
#178
smashwilson
closed
8 years ago
0
Uncaught Error: Repository has been destroyed
#177
sarmadali20
opened
8 years ago
0
HowTo Guide
#176
raeffu
closed
8 years ago
4
Duplicated merge conflicts
#175
NuclearCookie
opened
8 years ago
1
Update 1.3.5 is broken?
#174
gustaflindqvist
closed
8 years ago
3
Previous
Next