title: Resolving Git merge conflicts
body: <p>A Git repository has been cloned on several developers' local machines. Some changes have been made to the code in the repository. We're now getting the error:</p>
  
  <pre><code>error: Your local changes to the following files would be overwritten by merge:
  
          public_html/sites/file
          public_html/sites/file1.txt
          public_html/sites/file2.txt
  Please, commit your changes or stash them before you can merge.
  Aborting
  </code></pre>
  
  <p>I've read quite a few threads online, and several different options have been suggested. One approach was run:</p>
  
  <pre><code> git stash
   git pull
   git stash pop
  </code></pre>
  
  <p>I think I understand the basic principle of stashing. My question is, is this a good solution, and could I run into any issues using this approach? I have a reasonable understanding of web development in general, but I'm a fairly basic Git users and wouldn't have a lot of ability to get myself out of trouble at this point.</p>