GitLab unable to automerge. Merge request contains merge conflicts that must be resolved

GitLab is unable to automerge requests. All merge requests get the message “This merge request contains merge conflicts that must be resolved. You can try it manually on the command line”

The message seems incorrect, and I tested this by creating a new branch with “git branch -b new-branch-name” and change a file that is not going to cause merge conflicts.

  • git-flow vs. normal git commands
  • Git: How to protect develop/master branch in git-flow (from rookies) via access control?
  • git remote doesn't seem to be working at all
  • Puppet agent: provider git is not functional on this host
  • Linux kernel “historical” git repository with full history
  • Vanishing file included in .gitignore
  • When I push this new branch and create a new merge request, Gitlab still says it cannot auto merge.

    Any recommendations to fix this and what the reason is GitLab gives the “This merge request contains merge conflicts” message?

  • Git's criteria for comparing commits, why include the committer?
  • got a git merge issue after git pull
  • What's the difference between `git config` and `git push --set-upstream`
  • Why is this git clone command failing?
  • What does the .git folder not contain?
  • How do I edit an incorrect commit message with TortoiseGit?
  • One Solution collect form web for “GitLab unable to automerge. Merge request contains merge conflicts that must be resolved”

    This happens when your current branch is not in sync with remote branch. In this case, sometimes Git gets confused what to retain and what to ignore.

    To fix this do following

    ; 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 the conflicts if you get any. – Reference

    Your merge conflicts should be fixed by now.

    Git Baby is a git and github fan, let's start git clone.