stacked-pr-sync
A Node.js tool for syncing stacked pull requests with advanced conflict detection and resolution
reconcile-text
Intelligent 3-way text merging with automated conflict resolution
git-resolve-conflict
Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)