sascha-wolf / sublime-GitConflictResolver Star 44 Code Issues Pull requests A little plugin to help you resolving this nasty conflicts. git conflict-resolution sublime-text sublime-text-3 hacktoberfest sublime-text-package git-conflicts sublime-text-3-package git-conflict-resolver Updated Nov 18, 2016 Python
cotnw / codiff Star 9 Code Issues Pull requests VSCode extension for CoDiff vscode-extension git-conflict-resolver Updated May 28, 2021 TypeScript