Create git-imerge.md (#934)

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`