Git Flow - hotfix on an old version

Keven January 16, 2018

Hi, we want to switch from Mercurial to Git. So I'm tring to check the workflow.

But I don't understand how I can use the correctly the hotfix workflow to correct and old version. For exemple let's say we are about to release the version 3.0.0.0 and a client found a critical bug on the version 1.0.0.0 and for some reason he can't update de system to the lastest version. Then I create and hotfix branch from the tag 1.0.0.0 named 1.0.0.2. In Mercurial I would only close the branch but in Git when I try the finish the hotfix, it try to merge with the master witch as no sens for me since the code as changed in version 2.0.0.0

 

I active Git Flow AVH and create a new test repo, but I dont see change with the standard Git Flow.

 

Thanks.

Capture_d'écran_011618_092153_AM.jpg

2 comments

adamwojcinski July 26, 2018

I have the some problem

Mateusz Stefaniak February 24, 2021

Same problem here...

Comment

Log in or Sign up to comment
TAGS
AUG Leaders

Atlassian Community Events