> This only thing i'm a bit afraid of is the technical side of reverting a > merge. It's > one of those this that you need to be careful with in git.
I think this means all merges must come in as one big squashed patch. If they come in as multiple commits or rebase, then it gets reverted automatically. --Alex