Merge From

Merge From merges changes from one branch into the current branch from the time their histories diverged from the current branch.

To use this action, right-click a branch and select New Local Branch From….

Merge From Branch The branch to merge into the current branch. Into Current Branch Displays the current branch.

When you click OK, the output from the Git command is shown in the text box.

You may also need to Merge - Abort.