Reverting a git merge commit, then reverting the revert

Question

Our team uses Github Pull Requests to manage our workflow, much like what is described here. Upon manually reviewing the accepted Pull Request, we occasionally need to reve

Answer 1

If you get a branch-per-feature regiment going, you can rebuild a release candidate with what features you like. You will not need to "revert a merge":

further reading: https://plus.google.com/109096274754593704906/posts/R4qkeyRadLR

Please see the comments as well for additional insight. It works really well for us.