Modify Instructions for Resolving Merge Request Locally
This was recently pointed out by a user...
GitLab is providing the wrong instructions for users on merging locally. When the user has a merge conflict and they click the Merge Locally option (which is often required as the GitLab UI can’t handle it), they are given the following instructions:
Check out, review, and merge locally
Step 1. Fetch and check out the branch for this merge request
git fetch origin
git checkout -b branch-release-3 origin/branch-release-3
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin
git checkout origin/master
git merge --no-ff branch-release-3
Step 4. Push the result of the merge to GitLab
git push origin master (!)
Tip: You can also checkout merge requests locally by following these guidelines.
Note this is asking the user to pull master and merge in source branch locally and push back up to master. This should not be the case. No one should be able to push to master directly correct, even maintainers? My understanding is it should all come through merge request.
Instead, the instructions should be to checkout the source branch locally and do a merge with master in local, then push back up to source branch and complete merge in the GitLab merge request.
It seems there should be better instructions provided in the case that the Master branch is protected.