title: Git replacing current remote branch with master
body: <p>I feel like I know how to do it, but I can't do it.</p>
  
  <p>I am trying to create github pages. On remote origin I have 2 branches: master and gh-pages.</p>
  
  <p>I accidentally updated remote gh-pages with update I don't want; I want my remote gh-pages to look exactly like remote master or local master. (My local master is up-to-date with remote master). The problem is, when I try to pull gh-pages, it conflicts with my local master.</p>
  
  <p>How can I replace remote branch gh-pages with either remote/local master? (granted the current remote gh-pages conflicts with remote/local master)</p>
  
  <pre><code>Blah-Air:SomeBranch blablah$ git pull origin gh-pages
  remote: Counting objects: 15, done.
  remote: Compressing objects: 100% (13/13), done.
  remote: Total 15 (delta 1), reused 15 (delta 1), pack-reused 0
  Unpacking objects: 100% (15/15), done.
  From https://github.com/SomeGitHub/SomeBranch
   * branch            gh-pages   -&gt; FETCH_HEAD
   * [new branch]      gh-pages   -&gt; origin/gh-pages
  Auto-merging index.html
  CONFLICT (add/add): Merge conflict in index.html
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>^ As you can see, I need to fix the conflict, but I wasn't sure how to.</p>