| commit | 62fe87b688443eb1ae9f44efaeab75c8547c16e2 | [log] [tgz] |
|---|---|---|
| author | Leopold Schabel <leo@nexantic.com> | Mon Sep 19 13:52:52 2022 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Sep 19 13:52:52 2022 +0000 |
| tree | 4edc0e456f261709b5e5c6059e8c61108f34dde9 | |
| parent | 5c32869e0e6d4e4f6e6ff6f264c547468170b657 [diff] | |
| parent | 0ee9d9ec379f80f4d2c0af487cf409244c53a9c9 [diff] |
Merge "Update merge conflict tooltip to be more actionable"
diff --git a/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.ts b/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.ts index 3887ee5b..eab6638 100644 --- a/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.ts +++ b/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.ts
@@ -34,7 +34,7 @@ export const MERGE_CONFLICT_TOOLTIP = 'This change has merge conflicts. ' + - 'Download the patch and run "git rebase". ' + + 'Rebase on the upstream branch (e.g. "git pull --rebase"). ' + 'Upload a new patchset after resolving all merge conflicts.'; export const GIT_CONFLICT_TOOLTIP =