Hi, I am having trouble merging from an upstream source. I checked-out
my now out-of-date fork:

  $ git clone g...@github.com:trans/tomdoc.git

Then added upstream remote:

  $ git remote add upstream g...@github.com/defunkt/tomdoc.git

Then did a fetch and merge:

  $ git fetch upstream
  $ git merge upstream/master

But it just reports:

  Already up-to-date.

But my repo is clearly not up-to-date. It doesn't even have the same
files in it.

What am I missing?

-- 
You received this message because you are subscribed to the Google Groups 
"GitHub" group.
To post to this group, send email to github@googlegroups.com.
To unsubscribe from this group, send email to 
github+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/github?hl=en.

Reply via email to