diff --git a/pages/common/git-imerge.md b/pages/common/git-imerge.md index 5ed9b24361..4e50d900a1 100644 --- a/pages/common/git-imerge.md +++ b/pages/common/git-imerge.md @@ -19,6 +19,10 @@ `git imerge continue --no-edit` -- Wrap up the imerge operation, after all conflicts are resolved: +- 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 {{previous_branch}}`