> 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
I get ... $ git checkout master Switched to branch "master" $ rake rdoc ... $ git add rdoc $ git checkout -m gh-pages M rdoc/classes/... ... M rdoc/created.rid M rdoc/files/README_rdoc.html M rdoc/files/lib/... ... Switched to branch "gh-pages" $ git checkout --theirs fatal: --ours/--theirs is incompatible with switching branches. (but if I provide the filenames to the checkout it will succeed) --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
