How to merge remote master to local branch

Question

I have a local branch of a project (\"configUpdate\") that I\'ve forked from somebody else\'s project and I\'ve done a load of changes on it and would like to merge the changes

Answer 1

git rebase didn't seem to work for me. After git rebase, when I try to push changes to my local branch, I kept getting an error ("hint: Updates were rejected because the tip of your current branch is behind its remote counterpart. Integrate the remote changes (e.g. 'git pull ...') before pushing again.") even after git pull. What finally worked for me was git merge.

git checkout 
git merge  

If you are a beginner like me, here is a good article on git merge vs git rebase. https://www.atlassian.com/git/tutorials/merging-vs-rebasing