Supporting a --force option to smash a merge even if the changes look incompatible...