Resolving Merge Conflicts - Difference Between The Gitlab UI & Manuel
Hi all,
I have a question about Resolving Merge Conflict between Automatic Gitlab UI stategy and the description about manual strategy.
In this blog post at the "How does that work?" section, it's describe th automatic Gitlab Merge strategy by these followings commands :
If the source branch is new-feature and the target branch is master, then this does basically the same thing as running:
git checkout new-feature
git merge master
(In my case the conflict are between new-feature and develop, so Gitlab merge develop into my new-feature branch).
However, Gitlab also offers me a manual resolution by following theses steps :
Check out, review, and merge locally
Step 1. Fetch and check out the branch for this merge request
git fetch origin
git checkout -b new-feature origin/new-feature
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout develop
git merge --no-ff new-feature
Step 4. Push the result of the merge to GitLab
git push origin develop
Tip: You can also checkout merge requests locally by following these guidelines.
And that's exactly what i need, but why The Gitlab UI strategy dont do the same ?
Thx a lot for explanation.