Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

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.

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

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

5,738 views 4 12
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you