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

gitflow wrongly merge master back to develop while finishing hotfix or release

I'm facing problem while finishing hotfix or release branch. Gitflow merges the horfix or release to master and not to develop. Instead of merging hotfix or release back to develop, master branch is back merged to develop

Source tree version: 2.8.4

Embedded git: 2.15.1

sh.exe C:\Users\john\AppData\Local\Atlassian\SourceTree\gitflow_local\gitflow\git-flow hotfix start test2
sh.exe C:\Users\john\AppData\Local\Atlassian\SourceTree\gitflow_local\gitflow\git-flow hotfix finish -p -k -n test2

sh.exe C:\Users\john\AppData\Local\Atlassian\SourceTree\gitflow_local\gitflow\git-flow hotfix finish -p -k -n test2
Your branch is up to date with 'origin/master'.
Switched to branch 'master'
Merge made by the 'recursive' strategy.
developers.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Your branch is up to date with 'origin/develop'.
Switched to branch 'develop'
Merge made by the 'recursive' strategy.
developers.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

To https://github.com/johnges/tutorial.git
073a968..7ed2963 develop -> develop

To https://github.com/johnges/tutorial.git
88e9f15..73ea02f master -> master


Summary of actions:
- Hotfix branch 'hotfix/test2' has been merged into 'master'
- Master branch 'master' has been back-merged into 'develop'

- Hotfix branch 'hotfix/test2' is still locally available; it is still remotely available on 'origin'
- 'develop', 'master' and tags have been pushed to 'origin'
- You are now on branch 'develop'

Completed successfully.

1 answer

I found that my source tree has been updated the gitflow version from https://github.com/petervanderdoes/gitflow-avh

and that is the reason I got the follwong wrong commit message

Master branch 'master' has been back-merged into 'develop'

Hey @John Britto, I'm having this same problem, and was wondering what you meant.

 

Where in the source does it tell us the gitflow version?

Also, is this supposed to be the expected behavior for the newest gitflow version?  Or is that a bug?

@John Britto Okay, this explains all.  https://github.com/nvie/gitflow/issues/49

This is the expected behavior now, because of git-describe.

Like John Britto likes this

Suggest an answer

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

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,999 views 0 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