Migrate merge conflicts modal

What does this MR do?

A tiny MVC for #229677 (closed) where we migrate all the old HAML code for this modal to a new Vue app. This effort is broken into 5 merges.

What	Merge
Add new modal and replace mr_widget_header	!47889 (merged)
Update mr_widget_conflicts
Update mr_widget_conflicts_warning	TBA
Update mr_widget_conflicts_help	TBA
Remove _how_to_merge.html.haml and extra JS	TBA

Screenshots (strongly suggested)

Before	After

Does this MR meet the acceptance criteria?

Conformity

• Changelog entry
• [-] Documentation (if required)
• [-] Code review guidelines
• [-] Merge request performance guidelines
• [-] Style guides
• [-] Database guides
• [-] Separation of EE specific content

Availability and Testing

• Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process.
• Tested in all supported browsers
• [-] Informed Infrastructure department of a default or new setting change, if applicable per definition of done

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

• [-] Label as security and @ mention @gitlab-com/gl-security/appsec
• [-] The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
• [-] Security reports checked/validated by a reviewer from the AppSec team

Related to #229677 (closed)

changed milestone to %13.7

added component:modal pajamasintegrate typemaintenance workflowin review labels

added typefeature label

added frontend label

Reviewer roulette

Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category (e.g. frontend or backend), and by a maintainer in all other categories.

To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited, or the chosen person is unavailable.

To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.

Once you've decided who will review this merge request, mention them as you normally would! Danger does not automatically notify them for you.

Category	Reviewer	Maintainer
frontend	André Luís (@andr3) (UTC+0, same timezone as @oregand)	Tim Zallmann (@timzallmann) (UTC+1, 1 hour ahead of @oregand)

If needed, you can retry the danger-review job that generated this comment.

Generated by Danger

added 1 commit

• 8f6530f7 - Add changelog entry

Compare with previous version

assigned to @astoicescu

@astoicescu

Would you mind giving this small MVC a review please?

changed the description

Bundle size analysis [beta]

This compares changes in bundle size for entry points between the commits 4050f448 and 468287ca

Special assets

Entrypoint / Name	Size before	Size after	Diff	Diff in percent
average	3.14 MB	3.14 MB	-	0.0 %
mainChunk	1.95 MB	1.95 MB	-	0.0 %

---

Please look at the full report for more details

---

Read more about how this report works.

Generated by Danger

approved this merge request

unassigned @astoicescu

assigned to @kushalpandya

added 1 commit

• 6cbdb51d - Migrate merge conflicts modal

Compare with previous version

added 1 commit

• 03c5c575 - Migrate merge conflicts modal

Compare with previous version

added 1 commit

• 468287ca - Remove un-needed id prop

Compare with previous version

Setting label ~"group::monitor" based on @oregand's group.

added grouprespond label

Setting label(s) devopsmonitor sectionops based on ~"group::monitor".

added devopsmonitor sectionops labels

approved this merge request

resolved all threads

merged

mentioned in commit 8e2f8b83

added workflowstaging label and removed workflowin review label

added workflowcanary label and removed workflowstaging label

added workflowproduction label and removed workflowcanary label

added releasedcandidate label

added releasedpublished label and removed releasedcandidate label

removed typefeature label