替代方案

git-imerge

mhagger/git-imerge

Incremental merge for git

标签

  • git
  • merge-conflicts
  • python