git imerge
Perform a merge or rebase between two Git branches incrementally. Conflicts between branches are tracked down to pairs of individual commits, to simplify conflict resolution. More information: https://github.com/mhagger/git-imerge.
- Start imerge-based rebase (check out the branch to be rebased, first):
git imerge rebase
- Start imerge-based merge (check out the branch to merge into, first):
git imerge merge
- Show ASCII diagram of in-progress merge or rebase:
git imerge diagram
- Continue imerge operation after resolving conflicts (
git addthe conflicted files, first):
git imerge continue --no-edit
- Wrap up imerge operation, after all conflicts are resolved:
git imerge finish
- Abort imerge operation, and return to the previous branch:
git imerge remove && git checkout
来源:tldr-pages contributors · 作者与贡献记录 · CC BY 4.0。离线整理了版式、链接和媒体显示。
