GitHub topics: git-conflict-resolver
aminelazio01/git-conflict-resolver-web
A simple web-based tool to resolve Git merge conflicts directly in your browser.
Language: JavaScript - Size: 13.7 KB - Last synced at: 24 days ago - Pushed at: 24 days ago - Stars: 0 - Forks: 0

BaseMax/git-conflict-resolver-web
A simple web-based tool to resolve Git merge conflicts directly in your browser.
Language: JavaScript - Size: 14.6 KB - Last synced at: 5 days ago - Pushed at: 25 days ago - Stars: 0 - Forks: 1

cotnw/codiff
VSCode extension for CoDiff
Language: TypeScript - Size: 298 KB - Last synced at: 1 day ago - Pushed at: about 4 years ago - Stars: 10 - Forks: 0

sascha-wolf/sublime-GitConflictResolver
A little plugin to help you resolving this nasty conflicts.
Language: Python - Size: 432 KB - Last synced at: 7 days ago - Pushed at: over 8 years ago - Stars: 44 - Forks: 6
