Follow the below steps:

git checkout develop
git pull
git checkout <your-branch-name>
git merge develop

The above steps will merge the changes from develop into your branch and probably create a new commit, 
with a comment making it clear that it's a merge.

There are other ways do to update the local branch, i would say advance option - use rebase instead on merge.

git checkout develop 
git pull 
git checkout <your-branch-name> 
git rebase develop

the above command will rewind the time to the point at which your branch diverged from develop, pull in all the changes ondevelop, 
thus bringing your branch in line with develop but with no commits and apply your commit at the end. 

-Hussain
Git – Update local branch with remote Develop

Post navigation