title: Difference between git merge master and origin/master?
body: <p>Result of the command <code>git merge origin/master</code>:</p>
  
  <pre><code>javanoob@DELL:~/workspace/PROJECT_One$ git merge origin/master 
  Updating d83ef9c..dd520ea
  error: The following untracked working tree files would be overwritten by merge:
      sample.txt
  Please move or remove them before you can merge.
  Aborting
  </code></pre>
  
  <p>Result of the command <code>git merge master</code>:</p>
  
  <pre><code>javanoob@DELL:~/workspace/PROJECT_One$ git merge master
  Already up-to-date.
  </code></pre>
  
  <p>When I do the command <code>git merge origin/master</code> It shows that there are some files which will be overwritten but if I do the same command without the prefix <code>origin/</code> it says everything is already up-to-date.</p>
  
  <p>What is wrong in this setup?</p>
  
  <p>I don't know if it matters but before running these commands, I did run the command <code>git fetch origin</code></p>