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.

  • How do I download from gitorious?
  • Is the git submodule name used for anything other than display?
  • git gc: no space left on device, even though 3GB available and tmp_pack only 16MB
  • How to have the result of «git commit -v» in a splited window instead of in comments ?
  • Removing unwanted files from history including all refs with filter-branch
  • GnuTLS: Failed to acquire random data with GIT_SSH_COMMAND
  • 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?

  • Unable to normalize line endings for Git in Visual Studio Project
  • Rails 3 and Heroku: automatically “rake db:migrate” on push?
  • Automatic Git web deployment when pushing
  • Ubuntu / DigitalOcean - Unable to fetch packages to install git on a fresh install
  • Make git sub-repository from another Repository
  • Protecting sensitive information in Git
  • 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.