Merge branch
Provided the entire repo has been cloned/pulled to the local system, switch the current_branch to a branch that needs the merger with:
git checkout current_branch
Git should now display Switched to a new branch 'current_branch'. To now merge changes from target_branch to current_branch, use:
git merge target_branch
Changes to target_branch should now also be added/merged to current_branch. If the repo is kept in a remote local, update the remote copy by pushing the changes to current_branch:
git push origin current_branch