sascha-wolf sublime-GitConflictResolver issues

sascha-wolf / sublime-GitConflictResolver

A little plugin to help you resolving this nasty conflicts.

MIT License

44 stars 6 forks source link

issues

Newest

Newest Most commented Recently updated Oldest Least commented Least recently updated

Performance issues with large files

#21 nicbou opened 3 years ago
2
git conflict resolver breaks status bar display of branches

#20 JanaJarecki opened 4 years ago
0
Where is not a way to resolve conflicts line by line like the conflict resolver in WebStorm

#19 SANGED closed 6 years ago
2
Gutter marks linger after edits

#18 michaelblyons opened 6 years ago
0
User configuration to show relative path is not working.

#17 jimbatamang opened 6 years ago
0
Added Features to Keep Both Changes & Swap (keeps both but swaps)

#16 realdubb closed 5 years ago
0
Plugin slowing sublime text on big scss or css files

#15 Eduruiz opened 8 years ago
2
Keep 'ours' and 'theirs' seem to be inverted.

#14 e-dard closed 8 years ago
2
Fix error invoking git which happens on all of my Windows systems.

#13 jfultz opened 8 years ago
0
Its blocking LALT+X => # shortcut

#12 MiChAeLoKGB closed 8 years ago
3
Add a Menu [Feature Request]

#11 ggedde closed 8 years ago
2
The plugin is broken in Sublime 2.0.2

#10 jfjauvin closed 9 years ago
3
Show Conflict Files: Add cursor to tab after opening

#9 sascha-wolf closed 9 years ago
1
Show Conflict Files not working

#8 Bio2hazard closed 9 years ago
9
Keybind instructions broken

#7 Bio2hazard closed 9 years ago
2
Index Error on Find Next Conflict.

#6 lsiden closed 9 years ago
2
Gutter marks are buggy for SVN conflicts

#5 sascha-wolf opened 10 years ago
1
Function with keybinding to open the file with conflict

#4 passalini closed 10 years ago
2
diff3 resolution always picks "theirs"

#3 paulp closed 10 years ago
3
conflictstyle = diff3

#2 paulp closed 10 years ago
1
My two cents

#1 MarkMurphy opened 10 years ago
0