Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>So the accepted answer above didn't work for me perfectly. Namely, it seemed to lose the link to the original github author when it worked, and then didn't seem to work anymore after that. I think the problem was that the answer left out the / between the remote name and the branch. So it would fetch a branch called master from the remote, but then not be able to do anything with it. Not really sure why.</p> <p>Here's the way <a href="http://help.github.com/fork-a-repo/" rel="nofollow noreferrer">github recommends from their site</a>.</p> <p>Once you have cloned your forked repo, you do need to add a remote pointing to the original like the previous answer said. They like to call it upstream, but it doesn't matter.</p> <pre><code>git remote add upstream git://github.com/octocat/Spoon-Knife.git </code></pre> <p>Then you fetch</p> <pre><code>git fetch upstream </code></pre> <p>and you'll see the versions available for merging</p> <pre><code>From git://github.com/octocat/Spoon-Knife.git * [new branch] gh-pages -&gt; upstream/gh-pages * [new branch] master -&gt; upstream/master </code></pre> <p>Then you just need to choose the branch you want to merge in. Mind you these aren't local branches, they are stored under remotes. But provided you don't have a local branch called upstream/master (which is allowed) you should be fine merging with the line below:</p> <pre><code>git merge upstream/master </code></pre> <p>Alternatively you could shortcut the fetch/merge (after the initial fetch at least) with this line: </p> <pre><code>git pull upstream/master </code></pre>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload