> ## Documentation Index
> Fetch the complete documentation index at: https://docs.parallelane.com/llms.txt
> Use this file to discover all available pages before exploring further.

# Merge

> Merging a commit or branch into the current branch, and the three strategies

Right-click a commit and choose **Merge into current branch…**, and the strategy dialog opens.
Choose a strategy and click **Merge**.

<Frame>
  <img src="https://mintcdn.com/railgit/Youoqr4OEBTwrnAk/images/history-merge-dialog.png?fit=max&auto=format&n=Youoqr4OEBTwrnAk&q=85&s=1f308296b38fc512aed7a286ac891bfe" alt="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" width="886" height="500" data-path="images/history-merge-dialog.png" />
</Frame>

<CardGroup cols={3}>
  <Card title="Default" icon="git-merge">
    Fast-forwards when possible; otherwise creates a merge commit.
  </Card>

  <Card title="No fast-forward" icon="git-merge">
    Always creates a merge commit, leaving a record of the merge point in the history.
  </Card>

  <Card title="Squash" icon="layers">
    Stages the combined changes without committing or moving HEAD.
    Commit them yourself to finish.
  </Card>
</CardGroup>

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](/basics/discard-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](/history/rebase-merge#when-a-conflict-happens).

<Note>
  If the target commit is already included in the current branch, the merge item doesn't appear.
</Note>
