assuming you’re currently on branch childbranch:

git fetch
git rebase origin/master

please follow this link for better explanation

https://stackoverflow.com/questions/7200614/how-to-merge-remote-master-to-local-branch
Advertisements