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?
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.
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
Happy Friday, Funmakers! We had a Community Team offsite in Austin this week, and my mind feels primed for thinkin' from all the brainstorming we did! So, this week's Friday Fun thread w...
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!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG