E2E test for merge conflicts in diffs
The feature proposes to display merge conflicts in diffs similar to the existing Resolve Conflicts page.
gitlab-org/gitlab#267337 (closed)
Steps
Use ours
- Create a merge request with a conflict.
- Resolve the conflict using our changes.
- Confirm the conflict is resolved as expected.
Use theirs
- Create a merge request with a conflict.
- Resolve the conflict using their changes.
- Confirm the conflict is resolved as expected.