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
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

570 views 1 2
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