sascha-wolf/sublime-GitConflictResolver

Issues

• Performance issues with large files

  #21 opened 4 years ago by nicbou
  2

• git conflict resolver breaks status bar display of branches

  #20 opened 5 years ago by JanaJarecki
  0

• Where is not a way to resolve conflicts line by line like the conflict resolver in WebStorm

  #19 opened 7 years ago by SANGED
  2

• Gutter marks linger after edits

  #18 opened 7 years ago by michaelblyons
  0

• User configuration to show relative path is not working.

  #17 opened 7 years ago by jimbatamang
  0

• Plugin slowing sublime text on big scss or css files

  #15 opened 9 years ago by Eduruiz
  2

• Keep 'ours' and 'theirs' seem to be inverted.

  #14 opened 9 years ago by e-dard
  2

• Its blocking LALT+X => # shortcut

  #12 opened 9 years ago by MiChAeLoKGB
  3

• Add a Menu [Feature Request]

  #11 opened 9 years ago by ggedde
  2

• The plugin is broken in Sublime 2.0.2

  #10 opened 10 years ago by jfjauvin
  3

• Show Conflict Files: Add cursor to tab after opening

  #9 opened 10 years ago by sascha-wolf
  1

• Show Conflict Files not working

  #8 opened 10 years ago by Bio2hazard
  9

• Keybind instructions broken

  #7 opened 10 years ago by Bio2hazard
  2

• Index Error on Find Next Conflict.

  #6 opened 10 years ago by lsiden
  2

• Function with keybinding to open the file with conflict

  #4 opened 10 years ago by passalini
  2

• Gutter marks are buggy for SVN conflicts

  #5 opened 11 years ago by sascha-wolf
  1

• diff3 resolution always picks "theirs"

  #3 opened 11 years ago by paulp
  3

• conflictstyle = diff3

  #2 opened 11 years ago by paulp
  1

• My two cents

  #1 opened 11 years ago by MarkMurphy
  0