Add latest changes from gitlab-org/gitlab@master

2 files changed, 24 insertions, 8 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue
index 68cff1368af..b062833cdf8 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue
@@ -1,6 +1,7 @@
 <script>
 /* eslint-disable @gitlab/require-i18n-strings */
 import { GlModal, GlLink, GlSprintf } from '@gitlab/ui';
+import { helpPagePath } from '~/helpers/help_page_helper';
 import { escapeShellString } from '~/lib/utils/text_utility';
 import { __ } from '~/locale';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
@@ -10,24 +11,26 @@ export default {
     steps: {
       step1: {
         label: __('Step 1.'),
-        help: __('Fetch and check out the branch for this merge request'),
+        help: __("Fetch and check out this merge request's feature branch:"),
       },
       step2: {
         label: __('Step 2.'),
-        help: __('Review the changes locally'),
+        help: __('Review the changes locally.'),
       },
       step3: {
         label: __('Step 3.'),
-        help: __('Merge the branch and fix any conflicts that come up'),
+        help: __(
+          'Merge the feature branch into the target branch and fix any conflicts. %{linkStart}How do I fix them?%{linkEnd}',
+        ),
       },
       step4: {
         label: __('Step 4.'),
-        help: __('Push the result of the merge to GitLab'),
+        help: __('Push the target branch up to GitLab.'),
       },
     },
     copyCommands: __('Copy commands'),
     tip: __(
-      '%{strongStart}Tip:%{strongEnd} You can also checkout merge requests locally by %{linkStart}following these guidelines%{linkEnd}',
+      '%{strongStart}Tip:%{strongEnd} You can also check out merge requests locally. %{linkStart}Learn more.%{linkEnd}',
     ),
     title: __('Check out, review, and merge locally'),
   },
@@ -74,6 +77,13 @@ export default {
       default: null,
     },
   },
+  data() {
+    return {
+      resolveConflictsFromCli: helpPagePath('ee/user/project/merge_requests/conflicts.html', {
+        anchor: 'resolve-conflicts-from-the-command-line',
+      }),
+    };
+  },
   computed: {
     mergeInfo1() {
       const escapedOriginBranch = escapeShellString(`origin/${this.sourceBranch}`);
@@ -138,7 +148,13 @@ export default {
       <strong>
         {{ $options.i18n.steps.step3.label }}
       </strong>
-      {{ $options.i18n.steps.step3.help }}
+      <gl-sprintf :message="$options.i18n.steps.step3.help">
+        <template #link="{ content }">
+          <gl-link class="gl-display-inline-block" :href="resolveConflictsFromCli">
+            {{ content }}
+          </gl-link>
+        </template>
+      </gl-sprintf>
     </p>
     <div class="gl-display-flex">
       <pre class="gl-w-full" data-testid="how-to-merge-instructions">{{ mergeInfo2 }}</pre>
@@ -163,7 +179,7 @@ export default {
       />
     </div>
     <p v-if="reviewingDocsPath">
-      <gl-sprintf :message="$options.i18n.tip">
+      <gl-sprintf data-testid="docs-tip" :message="$options.i18n.tip">
         <template #strong="{ content }">
           <strong>{{ content }}</strong>
         </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
index a2c9cfe53cc..1621b6831a2 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
@@ -144,7 +144,7 @@ export default {
           :size="glFeatures.restructuredMrWidget ? 'small' : 'medium'"
           data-testid="merge-locally-button"
         >
-          {{ s__('mrWidget|Merge locally') }}
+          {{ s__('mrWidget|Resolve locally') }}
         </gl-button>
       </template>
     </div>