If you have forked my repo, you can just add the original repo as a remote source. Something like the following should work:
git remote add clemens git://github.com/clemens/i18n_demo_app.git git checkout -b clemens/master git pull clemens master git checkout master git merge clemens/master Maybe you need to resolve some conflicts by hand but that should basically do the trick. On Sep 13, 6:49 pm, Christian Lescuyer <[EMAIL PROTECTED]> wrote: > > did you pull the newest version from my repo? > > Oops, you're right! I have no idea how I correct this, though. > > I know I can just clone your rep and copy my files in there, but I > tried to do it by merging. No luck. "git pull" tells me I'm already up > to date. "git merge" tells me "not something I can merge". Uh? > > Christian --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "rails-i18n" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/rails-i18n?hl=en -~----------~----~----~----~------~----~------~--~---
