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

Finish hotfix merges master into develop problem

and-rew April 27, 2018

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
Atlassian Team members are employees working across the company in a wide variety of roles.
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?

and-rew June 5, 2018

@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
Atlassian Team members are employees working across the company in a wide variety of roles.
April 30, 2018

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

and-rew May 4, 2018

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

and-rew May 31, 2018

Can anybody help with this issue?

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events