Skip to content
/ git-resolve-conflict Public

💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)

License

MIT license
52 stars 10 forks Branches Tags Activity
Star
Notifications You must be signed in to change notification settings

jakub-g/git-resolve-conflict

Error
Looks like something went wrong!

About

💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)

Topics

git merge-conflicts conflict-resolution git-mergetools resolve-conflicts conflicting-changes

Resources

Readme

License

MIT license
Activity

Stars

52 stars

Watchers

2 watching

Forks

10 forks
Report repository

Releases

8 tags

Packages

No packages published

Contributors 2

  •  
  •  

Languages