title: How do I resolve conflicts with Git?
body: <p>I have a <a href="https://github.com/networkx/networkx/pull/1662" rel="noreferrer">pull request</a> for which GitHub tells me "This branch has conflicts that must be resolved." I tried:</p>
  
  <pre><code>~/src/networkx: git rebase origin/master
  Current branch topo is up to date.
  ~/src/networkx: git merge origin/master
  Already up-to-date.
  </code></pre>