GitLab cannot log in. The merge request contains merge conflicts that must be resolved

Question

GitLab cannot automate requests. All merge requests receive the message "This merge request contains merge conflicts that must be resolved. You can try it manually on the command line"

The message seems to be wrong, and I checked this by creating a new branch with "git branch -b new-branch-name" and changing the file that would not cause merge conflicts.

When I push this new branch and create a new merge request, Gitlab still says that it cannot automatically merge.

Any recommendations on how to fix this, and for what reason does GitLab give the message "This merge request contains merge conflicts"?

Answer 1

This occurs when the current branch does not synchronize with the remote branch. In this case, sometimes Git gets confused about what to save and what to ignore.

To fix this, follow these steps:

; Go to master branch git checkout develop ; update master branch git pull ; go to you local branch and merge it with changes from master git checkout local-branch git merge develop 

Resolve conflicts if you receive them. - Link

Now merge conflicts should be fixed.