A question about the Gitflow workflow

Going through the Git workflow tutorial makes me understand various Git workflows even better. Awesome tutorial I must say.

I have a question regarding the Gitflow workflow explained in this tutorial
https://www.atlassian.com/git/workflows#!workflow-gitflow

In this workflow we have a develop branch where all feature branches will eventually merge into, before going into release and finally master.

Now let's say we have all feature branches already merged into develop and properly tested, and then, for some reasons, the higher management decides not to release one or more of these features. This could be due to a change in business requirements or some bug discovered at the very last minute (or simply 'because the boss said so') and that feature needs to be excluded from the current release.

What would be the best way to go from here? Should the team just do a 'git revert' to revert the relevant commits (this could take extra time, since the feature may involve quite a few commits and reverting them may introduce conflicts)? How does the Gitflow workflow address situations like this one?

1 answer

0 vote
Timothy Chin Community Champion Dec 01, 2013

Depends on how bad the branch is. If it's all bad, then you might want to create a new branch from where it branced out and then cherry pick the right commits (http://gitready.com/intermediate/2009/03/04/pick-out-individual-commits.html).

Suggest an answer

Log in or Sign up to answer
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 Keough
Published 12 hours ago in Training & Certification

The Project Administration in Jira Server Certification is here!

The Atlassian Certification you've been waiting for is here for good. We're thrilled to announce the official launch of our new Certification for Project Administration in Jira Server! The offering ...

61 views 0 7
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