how to resolve conflicts locally gitlab
Closely Related Answers
0
// 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.
Source: gitlab.com
Twitter 
LinkedIn