Finishing a release is not back merging into develop

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.

3 answers

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

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.

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

649 views 0 4
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you