Issues

• No gutter icon for the ours side of a two-way conflict (regex alternation)

  sascha-wolf/sublime-GitConflictResolver#23 · Filter by author dpc00 opened on Oct 20, 2026

• Keep Common Ancestor deletes the whole conflict when there is no ancestor section

  sascha-wolf/sublime-GitConflictResolver#22 · Filter by author dpc00 opened on Oct 20, 2026

• Performance issues with large files

  sascha-wolf/sublime-GitConflictResolver#21 · Filter by author nicbou opened on May 25, 2021
  2

• git conflict resolver breaks status bar display of branches

  sascha-wolf/sublime-GitConflictResolver#20 · Filter by author JanaJarecki opened on May 22, 2020

• Gutter marks linger after edits

  sascha-wolf/sublime-GitConflictResolver#18 · Filter by author michaelblyons opened on Jan 11, 2018

• User configuration to show relative path is not working.

  sascha-wolf/sublime-GitConflictResolver#17 · Filter by author jimbatamang opened on Dec 12, 2017

• Plugin slowing sublime text on big scss or css files

  sascha-wolf/sublime-GitConflictResolver#15 · Filter by author Eduruiz opened on Jun 9, 2016
  2

• Gutter marks are buggy for SVN conflicts

  bug
  sascha-wolf/sublime-GitConflictResolver#5 · Filter by author sascha-wolf opened on Apr 29, 2014
  1

  

• My two cents

  enhancement
  sascha-wolf/sublime-GitConflictResolver#1 · Filter by author MarkMurphy opened on Jan 22, 2014