Comment 2 for bug 1888659

Taking the end user perspective here, I disagree with "invalid" here - the feedback is misleading; it looks as if diff markers have been committed into the sources.

If this is expected behavior, can Launchpad print a note or warning that the MR won't cleanly merge and that some action is required to resolve it?