title: Having a pull request conflict issue
body: <p>I am trying to merge a branch with the master branch but my conflict is hard to resolve as it says use cmd line and with the cmd line options give it doesnt resolve the issue. </p>
  
  <p>Github is giving me this...</p>
  
  <p>Step 1: From your project repository, bring in the changes and test.</p>
  
  <pre><code>git fetch origin
  git checkout -b static origin/static
  git merge master
  </code></pre>
  
  <p>Step 2: Merge the changes and update on GitHub.</p>
  
  <pre><code>git checkout master
  git merge --no-ff static
  git push origin master
  </code></pre>
  
  <p>Then when i try it i get this output </p>
  
  <pre><code>(venv) C:\Users\jferguson\PycharmProjects\WebP1\DEMOPROJECT&gt;git fetch origin
  
  (venv) C:\Users\jferguson\PycharmProjects\WebP1\DEMOPROJECT&gt;git checkout -b static origin/static
  fatal: A branch named 'static' already exists.
  
  (venv) C:\Users\jferguson\PycharmProjects\WebP1\DEMOPROJECT&gt;git merge master
  Already up to date.
  
  (venv) C:\Users\jferguson\PycharmProjects\WebP1\DEMOPROJECT&gt;git checkout master
  Switched to branch 'master'
  Your branch and 'origin/master' have diverged,
  and have 2 and 2 different commits each, respectively.
    (use "git pull" to merge the remote branch into yours)
  
  (venv) C:\Users\jferguson\PycharmProjects\WebP1\DEMOPROJECT&gt;git merge --no-ff static
  Already up to date.
  
  (venv) C:\Users\jferguson\PycharmProjects\WebP1\DEMOPROJECT&gt;git push origin master
  To fortress-sefa.git
   ! [rejected]        master -&gt; master (non-fast-forward)
  </code></pre>
  
  <p>The conflicting files are </p>
  
  <pre><code>DEMOPROJECT/__pycache__/__init__.cpython-37.pyc
  DEMOPROJECT/__pycache__/settings.cpython-37.pyc
  DEMOPROJECT/__pycache__/urls.cpython-37.pyc
  DEMOPROJECT/__pycache__/wsgi.cpython-37.pyc
  </code></pre>
  
  <p>Is there a significance in the fact it is cache files?</p>