[LRUG] git question
Tom Stuart
tom at experthuman.com
Thu Aug 20 04:20:23 PDT 2009
On 20 Aug 2009, at 12:14, Tom Lea wrote:
>> Your commits are by definition a set of changes on top of the
>> remote master
> But which remote master?
Oh, this is a good point. To restate it: your "git pull" is probably
just fetching new commits from the master branch of your fork of Rails
on GitHub, but there won't be any new commits there. You either need
to update your fork's master branch to contain the upstream commits
from the main Rails repository (and then git pull will transfer those
to your local master branch) or, better, add the Rails repo as another
remote as Tom suggests and fetch commits directly from there before
you rebase.
Cheers,
-Tom
More information about the Chat
mailing list