> 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 -~----------~----~----~----~------~----~------~--~---
