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
To be
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:
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Can you please specify the version of Sourcetree you are using and on what platform?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.