On Thu, Feb 26, 2009 at 8:11 PM, sbfaulkner <[email protected]> wrote:
>> > git checkout master
>> > rake rdoc
>> > git add rdoc
>> > git checkout -m gh-pages
>> > git ls-files -u | awk '{ print $4 }' | sort | uniq | xargs git checkout
>> > --theirs
I tried a conflicted merge (not the exact same thing as your prior
commands but ought to be close enough. And at this stage I just did
git checkout --theirs .
It seemed to work... try it
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
