tree 5ccb5849e8b8c710a1a3ed6ff41d7ffe2b125386
parent 03046d8df22cd506f4686030625331183680b833
author Leopold Schabel <leo@nexantic.com> 1663592443 +0200
committer Leopold Schabel <leo@nexantic.com> 1663592443 +0200

Update merge conflict tooltip to be more actionable

We had less Git-inclined users follow these instructions verbatim
(downloading the change instead of staying on their feature branch,
not fetching upstream changes before running "git rebase").

Update the tooltip to be more helpful for new users.

Release-Notes: skip
Change-Id: I95bfb7e2b42f4220881e10204c4bbd6140735c8c