- Open TerminalTerminalGit Bash.
- Change the current working directory to your local project.
- Check out the branch you wish to merge to. Usually, you will merge into the default branch.
$ git checkout DEFAULT_BRANCH_NAME
- Pull the desired branch from the upstream repository. This method will retain the commit history without modification.
$ git pull https://hostname/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git BRANCH_NAME
- If there are conflicts, resolve them. For more information, see "Addressing merge conflicts".
- Commit the merge.
- Review the changes and ensure they are satisfactory.
- Push the merge to your GitHub repository.
$ git push origin DEFAULT_BRANCH_NAME
Merging an upstream repository into your fork
If you don't have push (write) access to an upstream repository, then you can pull commits from that repository into your own fork.