Skip to content
Snippets Groups Projects
Commit 5933d4c5 authored by Sarah Yasonik's avatar Sarah Yasonik
Browse files

Add content to create some merge conflicts

parent 00164633
No related branches found
No related tags found
No related merge requests found
Pipeline #14163061 failed
Loading
Loading
@@ -10,3 +10,10 @@ This template is compatible with [Auto DevOps](https://docs.gitlab.com/ee/topics
 
If Auto DevOps is not already enabled for this project, you can [turn it on](https://docs.gitlab.com/ee/topics/autodevops/#enabling-auto-devops) in the project settings.
 
### Test for merge conflicts behavior
If I add some content here, then force a conflict on another MR, can I recreate the bad behavior?
#### The bad behavior
It seems that the problem is that a no-longer-blocking merge request dependecy still shows as blocking if there are also merge conflicts? We'll see.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment