npm

git-mediate

Interactive tool for resolving git merge conflicts efficiently

brewmacoslinux
Try with needOr install directly
Source

About

Utility to help resolve merge conflicts

Commands

git-mediate

Examples

Start the interactive merge conflict resolution process$ git mediate
Resolve conflicts in a specific file during merge$ git mediate path/to/conflicted/file.txt
Complete merge after resolving all conflicts with git-mediate$ git commit -m 'Merge branch with resolved conflicts'