If you do not want to use the merge button or an automatic merge cannot be performed, you can perform a manual merge on the command line.
Step 1: From your project repository, bring in the changes and test.
git fetch origin git checkout -b branch-name origin/branch-name git merge master
Step 2: Merge the changes and update on GitHub.
git checkout master git merge --no-ff branch-name git push origin master
git fetch origin && git checkout -b branch-name origin/branch-name && git merge master && git checkout master && git merge --no-ff branch-name && git push origin master