update precondition messages in `merge` to instruct the user on how to resolve

[Arya Irani]

I split these up because I didn't want the discussion to get too huge:

• #4979
• #4980
• #4981
• #4982
• #4983
• #4984
• #4985