Your comment reminded me of managing merge conflicts in git (or any distributed source control system) With conflicts, best way to resolve is a human manually

Your comment reminded me of managing merge conflicts in git (or any distributed source control system) With conflicts, best way to resolve is a human manually deciding how to merge (which part of commit A & which part(s) of commit B to include) :D