On Fri, Oct 11, 2013 at 09:22:28AM -0400, Stephen Bash wrote: > > To mitigate problem 1, I will sometimes revert a local topic before > > doing the upstream merge, if I know it has been reworked. > > Peff (slightly off topic) - A coworker of mine actually ran into this > problem earlier this week. Is there recommended way to revert a merged > topic branch? I assume it's essentially reverted each commit introduced > by the branch, but is there a convenient invocation of revert? (easy to > remember and hard to screw up) If you merged the whole topic in at once, then you can use "git revert -m 1 $merge_commit" to undo the merge. If it came in individual pieces, then you have to revert each one individually (though if it was a series of merges, you can in theory revert each merge in reverse order). -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html