On Sun, Apr 10, 2011 at 6:19 AM, trans <transf...@gmail.com> wrote: > 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.
Well, just because your repo is up-to-date doesn't mean it's identical. Perhaps you have additional commits in your version that deleted/created files versus the upstream version. If you want it to be *identical* (ie throw away all your own changes), you could use 'git checkout upstream/master' instead. Also try: git log ..upstream/master git log upstream/master.. Have fun, Avery -- 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.
