> For the complete documentation index, see [llms.txt](https://jadelab.gitbook.io/jadegit/llms.txt). Markdown versions of documentation pages are available by appending `.md` to page URLs; this page is available as [Markdown](https://jadelab.gitbook.io/jadegit/0.18.0/developers/branches/merge.md).

# Merge

When managing branches, a selected branch may be merged into the current branch using the merge option in the branch context menu.

<figure><img src="/files/GRrdNmOiccmHaFtXmaLF" alt=""><figcaption></figcaption></figure>

Merging may also occur when pulling from a remote branch and a fast-forward merge isn't possible because the remote and local branches have diverged.

Merging triggers an [internal deployment](/jadegit/0.18.0/developers/deployment/internal.md) to update the database to reflect the changes being merged. If the deployment is unsuccessful and has to be aborted, the entire merge operation is aborted.

## Conflicts

If the merge results in conflicts, options are shown by the JadeGit Changes explorer to either resolve the conflicts or abort the operation.

<figure><img src="/files/2mtlffGckgsTCOl81ZiU" alt=""><figcaption></figcaption></figure>

When the Resolve Conflicts option is used, a dialog is displayed for them to be resolved before the merge operation can continue.

<figure><img src="/files/ncuY0YtuQosN5KDZF7b9" alt=""><figcaption></figcaption></figure>

{% hint style="warning" icon="screwdriver-wrench" %}
Conflict resolution relies on updating the merged result manually, including removal of the conflict markers, which can be error prone and may lead to deployment failures. This area requires improvement to provide a better user experience and validate changes to avoid deployment failures.
{% endhint %}