From 384557eb159a76948849175c871ef9cdd7db08ff Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Tue, 28 Jun 2016 11:57:32 +0100 Subject: [PATCH] Create git-imerge.md (#934) --- pages/common/git-imerge.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pages/common/git-imerge.md diff --git a/pages/common/git-imerge.md b/pages/common/git-imerge.md new file mode 100644 index 000000000..5ed9b2436 --- /dev/null +++ b/pages/common/git-imerge.md @@ -0,0 +1,24 @@ +# 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. + +- 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 the imerge operation, after all conflicts are resolved: + +`git imerge finish`