Finishing a release is not back merging into develop

Question

When I finish a release with SourceTree and Stash the release is merged into origin\master but not being merged back into origin\develop, causing origin/develop to be behind origin/Master 1 or more commits, or N commits behind. Is there something I'm missing or doing incorrectly? I thought finishing a release is suppose to merge into master and back merge into develop?

I created a release on my local develop branch made no changes and finished release and it merged to origin/Master but not origin/Develop causing origin/Master to be 1 commit ahead of origin/Develop.

Wahab Ahmed · Answer

Sometimes this is happening if we have got Merge Conflicts in the Master branch. So in this case you can resolve conflicts at the master branch and then merge master branch back to the develop. That will solve your problem.

electroid · Answer

+1

amir_shavit · Answer

Happens to me too.
Commits made to the release branch (both maual commits of changes and cherry picks) are not merged to develop