title: How to solve merge conflicts across forks?
body: <p>I have forked my repo say repoB from another repo say repoA. Now I don't have permissions to write into repoA. </p>
  
  <p>When I try to create a pull request on repoA to get the latest changes and merge those in to repoB I get a merge conflict error. How do I solve that?</p>
  
  <p>I tried this:</p>
  
  <pre><code>git checkout -b repoA master
  git pull https:repoA master
  
  git checkout master
  git merge --no-ff repoA
  git push origin master
  </code></pre>
  
  <p>N.B. I cannot checkout forkA as I don't have write permissions on that. </p>