6.6 Merging

Also see the git-merge(1) manpage. For information on how to resolve merge conflicts see the next section.

m     (magit-merge-popup)

This prefix command shows the following suffix commands along with the appropriate infix arguments in a popup buffer.

When no merge is in progress, then the popup buffer features the following commands.

m m     (magit-merge)

Merge another branch or an arbitrary revision into the current branch. The branch or revision to be merged is read in the minibuffer and defaults to the one at point.

Unless there are conflicts or a prefix argument is used, the resulting merge commit uses a generic commit message, and the user does not get a chance to inspect or change it before the commit is created. With a prefix argument this does not actually create the merge commit, which makes it possible to inspect how conflicts were resolved and to adjust the commit message.

m e     (magit-merge-editmsg)

Merge another branch or an arbitrary revision into the current branch and open a commit message buffer, so that the user can make adjustments. The commit is not actually created until the user finishes with C-c C-c.

m n     (magit-merge-nocommit)

Merge another branch or an arbitrary revision into the current branch, but do not actually create the commit. The user can then further adjust the merge, even when automatic conflict resolution succeeded and/or adjust the commit message.

m p     (magit-merge-preview)

Preview result of merging another branch or an arbitrary revision into the current branch.

When a merge is in progress, then the popup buffer features these commands instead.

m m     (magit-merge)

After resolving conflicts, proceed with the merge. If there are still conflicts, then this fails.

m a     (magit-merge-abort)

Abort the current merge operation.