git merge develop and master Issue

Question

I'm using Gitflow for my project. my develop branch is ahead of master branch by many commits in a while. But when I tried to merge master with develop by:

git merge develop

It says that Already up to date . Whats wrong with it or my operation?

Can anyone help?

Thanks

Answer 1

This may happen if you haven't pulled the develop branch changes recently. In this you can the one of the following things:

1. Pull remote develop changes to your local develop branch by:

   git checkout develop

   git pull develop

   git checkout master

   git merge develop

2. You can straightly merge origin/develop into local master branch by:

   git merge origin/develop