Git的增量合并:git-imerge

jopen 9年前

git-imerge 执行两个分支之间逐步合并。如果冲突遇到,找出到底是哪对提交冲突。

git-imerge 拥有两个主要设计目标:

  • Reduce the pain of resolving merge conflicts to its unavoidable minimum, by finding and presenting the smallest possible conflicts: those between the changes introduced by one commit from each branch.
  • Allow a merge to be saved, tested, interrupted, published, and collaborated on while it is in progress.

项目主页:http://www.open-open.com/lib/view/home/1416880844865