Fix pluralization in conflict message
What does this MR do?
When reviewing Doc: Update show merge request conflicts in dif... (!103899 - merged) for @patrickbajao, I noticed in this screencap that we used resolve conflicts
(plural) and resolve it
(singular) in the same message. Let's make both instances plural.
The assistance I need:
- Getting a new screenshot for
doc/user/project/merge_requests/img/conflict_ui_v15_6.png
- I also changed a second line in
app/assets/javascripts/diffs/components/diff_file.vue
that also looks like it refers to conflicts as singular. Is my proposed change correct?
(This merge request is technically UI text, but the documentation template is pretty close to what I need.)
Related issues
- Related to Highlight conflicts on diff of conflicted file ... (#365823 - closed) (the parent issue for the original work)
- Related to !103899 (merged) (the merge request where I noticed the change was needed)
Author's checklist
-
Optional. Consider taking the GitLab Technical Writing Fundamentals course. -
Follow the: -
If you're adding or changing the main heading of the page (H1), ensure that the product tier badge is added. -
If you are a GitLab team member, request a review based on: - The documentation page's metadata.
- The associated Technical Writer.
If you are a GitLab team member and only adding documentation, do not add any of the following labels:
~"frontend"
~"backend"
~"type::bug"
~"database"
These labels cause the MR to be added to code verification QA issues.
Reviewer's checklist
Documentation-related MRs should be reviewed by a Technical Writer for a non-blocking review, based on Documentation Guidelines and the Style Guide.
If you aren't sure which tech writer to ask, use roulette or ask in the #docs Slack channel.
-
If the content requires it, ensure the information is reviewed by a subject matter expert. - Technical writer review items:
-
Ensure docs metadata is present and up-to-date. -
Ensure the appropriate labels are added to this MR. -
Ensure a release milestone is set. - If relevant to this MR, ensure content topic type principles are in use, including:
-
The headings should be something you'd do a Google search for. Instead of Default behavior
, say something likeDefault behavior when you close an issue
. -
The headings (other than the page title) should be active. Instead of Configuring GDK
, say something likeConfigure GDK
. -
Any task steps should be written as a numbered list. - If the content still needs to be edited for topic types, you can create a follow-up issue with the docs-technical-debt label.
-
-
-
Review by assigned maintainer, who can always request/require the reviews above. Maintainer's review can occur before or after a technical writer review.