title: git - merge conflict when local is deleted but file exists in remote
body: <p>I am very new to git and wondered how I should go about a merge where in the local repo I have deleted several files on the master branch but these files exist within the remote master branch.</p>
  
  <p>After doing git-merge it shows the conflicts that have occured.</p>
  
  <p>Using git gui it shows that the local file is deleted, while the remote branch file has contents.</p>
  
  <p>How do you stop these files from being conflicted?
  Is there a simple way using git gui?</p>
  
  <p>Many thanks</p>