Create
cancel
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

Finish hotfix merges master into develop problem

The problem is that when i finish the hotfix than the hotfix branch merges first into master and than the master branch merges into develop. Why does it happen? I attach two pics for better understanding of what as is and what to be

As is

2018-04-27 10_00_55-Sourcetree.png

To be

2018-04-27 10_03_34-Sourcetree.png

 

2 answers

0 votes
Mike Corsaro Atlassian Team May 31, 2018

Hello! It seems that master isn't merged into develop, but the line is showing that it's just branched from master? What's the log message for that commit?

@Mike Corsaro Yeap, the hotfix is branched from the master as it required by gitflow methodology:

2018-06-05 16_49_45-git-flow cheatsheet.png

If you've meant the log message for merge's commit so it is here:
merge hotfix/test2-hotfix: Merge made by the 'recursive' strategy.

0 votes
Manju Atlassian Team Apr 30, 2018

Can you please specify the version of Sourcetree you are using and on what platform?

@Manju Source Tree v 2.4.8.0; Windows 10 Pro 64bit

Can anybody help with this issue?

Suggest an answer

Log in or Sign up to answer
TAGS
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