title: git pull origin master gives merge conflict: what should I do?
body: <p>I'm working on a branch (<code>my-branch</code>) that I created from master. </p>
  
  <pre><code>$ git checkout -b my-branch
  </code></pre>
  
  <p>I edited some files, and then checked them into the new branch:</p>
  
  <pre><code>$ git commit -a -m 'Add new feature'
  </code></pre>
  
  <p>Then I pulled from master (I'm not completely sure why I did this, or if it's good practice):</p>
  
  <pre><code>$ git pull origin master 
  </code></pre>
  
  <p>But pulling gave me lots of error messages: </p>
  
  <pre><code>   From github.com
   * branch            master     -&gt; FETCH_HEAD
  Auto-merging styles/common/module_more_info.scss
  CONFLICT (add/add): Merge conflict in styles/common/module_more_info.scss
  Auto-merging app/support/stagecraft_stub/responses/cloud.json
  CONFLICT (content): Merge conflict in app/support/stagecraft_stub/responses/cloud.json
  Auto-merging app/support/backdrop_stub/response_fetcher.js
  CONFLICT (content): Merge conflict in app/support/backdrop_stub/response_fetcher.js
  Automatic merge failed; fix conflicts and then commit the result.
  vagrant@pp-development-1:/var/apps/spotlight$ git status
  </code></pre>
  
  <p>Running <code>git status</code> now shows lots of changed files:</p>
  
  <p># On branch my-branch</p>
  
  <pre><code># Changes to be committed:
  #
  #       modified:   CONTRIBUTING.md
  #       modified:   README.md
  #       modified:   app/appBuilder.js
  [lots more files]
  #
  # Unmerged paths:
  #   (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  #
  #       both modified:      app/support/backdrop_stub/response_fetcher.js
  #       both modified:      app/support/stagecraft_stub/responses/cloud.json
  #       both added:         styles/common/module_more_info.scss
  </code></pre>
  
  <p>Firstly, what has happened, and secondly, what do I do?</p>
  
  <p>If I try to see what the differences are in any of the upper list of files, I get empty output, which is confusing (why does it want me to commit the file if there are no diffs?):</p>
  
  <pre><code>$ git diff CONTRIBUTING.md
  $
  </code></pre>
  
  <p>Should I review the three files that are under <code>Unmerged paths</code>, and then commit this as a merge commit? UPDATE: Most importantly, can I then push it to my branch <em>without</em> messing up the master branch?</p>
  
  <p>I don't seem to be able to roll back the last commit. </p>