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.
This year will be my first time attending Atlassian Summit, yay! So I wanted to use this Friday Fun topic to find out more from all of you. Are you attending? Is there anything specific you are look...
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