Modify the client-side messaging for "remotely merged" so that the message does not use the word "merged", with all its connotations. Perhaps something like "All of the commits on [source] have been manually applied to [target]."