When two versions of a system have drifted far apart, the request usually arrives as one line: "reconcile these two branches." It sounds like a merge. It almost never is. The real first question is not how do we combine these? but do we yet know enough to combine them safely? Most of the time, the h...