> git checkout master > git add rdoc > rake rdoc > git checkout -m gh-pages > git commit --no-verify -m "update rdoc" > > Does this look about right, or is there an easier way?
Partly answering my own question... this doesn't work every time... sometimes it has merge conflicts and I have to resolve them before committing. Is there an alternative to checkout -m that just overwrites any files instead of trying to merge? I can brute force it by mv'ing the rdoc out copying it into the working copy after checking out gh-pages, but I'm sure there's a better way than that. Help!?! (please) --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "GitHub" 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/github?hl=en -~----------~----~----~----~------~----~------~--~---
