GitLab

Created by: 2ndkauboy

When a merge request as a conflict, there is a link to show a modal on how to resolve it on the command line. But the modal is showing the following hint:

Step 1. Update the repo and checkout the branch we are going to merge

git fetch origin git checkout -b feature-branch origin/feature-branch

Step 2. Merge the branch and push the changes to GitLab

git checkout master git merge --no-ff feature-branch git push origin master

This hint is wrong, as it would not resolve the conflict on the branch, but merges the branch into master. A step 2 like the following would be correct:

git merge master
git push origin feature-branch

or even

git rebase master
git push --force

But the first solution is probably better for unexperienced users.