git merge

To join the development histories in two branches together, go to Tools > Git > Local Repository and select Branches.

In the Git Branches view, right-click a remote branch, and then select a merge option in the context menu. If the commit you are merging can be reached by following the first commit's history, there is no divergent work to merge together. To allow Git to move the branch pointer forward, select Merge <remote branch> into <local branch> (Fast-Forward). If you do not want to fast-forward the branch, select Merge <remote branch> into <local branch> (No Fast-Forward).

Configure merge tools

Only graphical merge tools are supported. You can configure the merge tool to use on the command line. For example, to use the KDiff3 merge tool, enter the following command:

git config --global merge.tool kdiff3