Clarify misleading Merge Conflict message
The tooltip message for "Cannot merge" stated:
"The change cannot be merged due to a path conflict. Rebase the change
locally and upload the rebased commit for review."
This message is displayed whenever a change cannot be merged. The user
is lead to believe that they must do a manual rebase. However in some
cases, the UI rebase button is sufficient (i.e Fast Forward Only
projects require a rebase, even if none of the same files were touched).
If the rebase button is available, the user should first try that before
doing it locally.
The tooltip now states:
"The change cannot be merged due to a path conflict. Rebase the change
and upload the rebased commit for review."
Change-Id: I98c31592a8db97253efdd7e11a4c4449c5696dc5
1 file changed
