Git Flow - hotfix on an old version

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

0 comments

Comment

Log in or Sign up to comment
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

799 views 0 4
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you