Comment 5 for bug 143977

I don't think this can be totally automatic, otherwise we wouldn't have conflicted in the first place, but we could certainly have commands to help resolve conflicts.