Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

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

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 votes
Timothy Community Leader 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
TAGS
Community showcase
Published in DevOps

Step up your DevOps game webinar Q&A series - Questions answered!

  On October 21st, 2020 we hosted a webinar titled,   Step Up You DevOps Game with 4 Key Integrations for Jira and Bitbucket. We had a great showing and high engagement, but that meant th...

101 views 0 1
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