title: Merge blocked: merge conflicts must be resolved
body: <p>I am trying to merge my master branch to a production branch in Gitlab for my CI/CD pipeline.</p>
  <p>I get a warning that the source branch is 1 commit behind the target branch. I tried the recommended fix from gitlab(Here and Youtube), but I am having no luck.</p>
  <p>In my local environment, I created a production branch. I tried to merge my master to production, but continue to get errors. These are some of the commands I have been using(not in that order) that have been ineffective.</p>
  <pre><code>git pull master production --allow-unrelated-histories
  git ls-tree production
  git config pull.rebase false
  git ls-tree production
  git rebase master/production
  git push -u  origin production
  git merge --no-ff 'master'
  git rebase --continue
  </code></pre>
  <p><img src="https://i.stack.imgur.com/moCoV.jpg" alt="enter image description here" /></p>
  <p>Thanks in advance</p>