Merge conflict instructions don't work to fix locally and don't match docs
Summary
The dialog for fixing locally doesn't work when working in a feature branch. It directs me to attempt to commit to main/master
Steps to reproduce
- Write an MR
- Someone else merges to the same file
- Merge conflict happens
Example Project
gitlab-com/www-gitlab-com!115111 (merged)
What is the current bug behavior?
Resolve locally attempts to merge to main/master. Clicking through to the docs provides more helpful instructions, but not customized to the branch you're working on
What is the expected correct behavior?
Resolve locally instructions resolve conflict on the branch the MR is working on
Relevant logs and/or screenshots
Output of checks
This bug happens on GitLab.com