Skip to main content
Right-click a commit and choose Merge into current branch…, and the strategy dialog opens. Choose a strategy and click Merge.
The Merge feature/multiregion dialog, with Default selected among the Default, No fast-forward, and Squash options under STRATEGY, the line 'Fast-forwards when possible; otherwise creates a merge commit.' below them, and the footer reading 'Merges feature/multiregion into the current branch.' beside the Cancel and green Merge buttons

Default

Fast-forwards when possible; otherwise creates a merge commit.

No fast-forward

Always creates a merge commit, leaving a record of the merge point in the history.

Squash

Stages the combined changes without committing or moving HEAD. Commit them yourself to finish.
The result appears as a toast.
  • Already up to date means there is nothing to merge, so nothing changes.
  • Merge complete means a fast-forward or a merge commit was created. Only in this case is Undo recorded.
  • Squash complete means the changes are staged. Check them in the Working copy panel and commit them yourself to finish.
  • Conflict is covered in When a conflict happens.
If the target commit is already included in the current branch, the merge item doesn’t appear.