tldr/pages/common/git-imerge.md

30 lines
890 B
Markdown
Raw Normal View History

2016-06-28 11:57:32 +01:00
# 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.
2019-01-30 11:19:23 +00:00
> Homepage: <https://github.com/mhagger/git-imerge>.
2016-06-28 11:57:32 +01:00
- Start imerge-based rebase (checkout the branch to be rebased, first):
`git imerge rebase {{branch_to_rebase_onto}}`
- Start imerge-based merge (checkout the branch to merge into, first):
`git imerge merge {{branch_to_be_merged}}`
- Show ASCII diagram of in-progress merge or rebase:
`git imerge diagram`
- Continue imerge operation after resolving conflicts (`git add` the conflicted files, first):
`git imerge continue --no-edit`
- Wrap up imerge operation, after all conflicts are resolved:
2016-06-28 11:57:32 +01:00
`git imerge finish`
- Abort imerge operation, and return to the previous branch:
`git-imerge remove && git checkout {{previous_branch}}`