sublime-gitconflictresolver
https://github.com/sascha-wolf/sublime-gitconflictresolver
Python
A little plugin to help you resolving this nasty conflicts.
Triage Issues!
When you volunteer to triage issues, you'll receive an email each day with a link to an open issue that needs help in this project. You'll also receive instructions on how to triage issues.
Triage Docs!
Receive a documented method or class from your favorite GitHub repos in your inbox every day. If you're really pro, receive undocumented methods or classes and supercharge your commit history.
Python not yet supported0 Subscribers
Add a CodeTriage badge to sublime-gitconflictresolver
Help out
- Issues
- Performance issues with large files
- git conflict resolver breaks status bar display of branches
- Fix error invoking git which happens on all of my Windows systems.
- Gutter marks linger after edits
- User configuration to show relative path is not working.
- My two cents
- Gutter marks are buggy for SVN conflicts
- Plugin slowing sublime text on big scss or css files
- Docs
- Python not yet supported