Git-Flow - Features that fail testing?

I was hoping to design a git workflow that was aligned with best practices for larger dev teams. Git-flow seems like a great solution. The one concern I have has to do with the develop branch being the first integration point for features, and also the starting point for the release branch. What happens when a feature that is planned for a release and has been merged into the develop branch fails UAT? If there are 10 features in the develop branch and 1 is pulled from the release, how do we create our release branch? How do others handle this with Git-Flow? Are there other branching strategies that can handle it?

1 answer

Hi Keith,

At Atlassian it's rare that we pull code out after being merged. That said, you can revert a merge with git revert by using the -m flag. See "Reverting a merge" on this page. This should work fine with git-flow, as it generates a reverse patch commit that backs out all of the changes introduced by the merge. You can then merge this commit to any other branches in your git-flow workflow as normal.

cheers,

TIm

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted Oct 08, 2018 in Teamwork

If you could delete any meeting from your calendar, which one would it be?

Let’s face it: most of us have too many meetings on our calendars. And few things are a bigger waste of time than recurring meetings that no longer provide any value to attendees (or the busines...

451 views 16 9
Join discussion

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