On Thu, Feb 26, 2009 at 11:30 PM, sbfaulkner <[email protected]> wrote:
>> git checkout --theirs . >> >> It seemed to work... try it there's a single "." at the end of that command; sorry I should have been specific, seeing gmail doesn't show monospace properly in any browser :-) > $ git checkout --theirs > fatal: --ours/--theirs is incompatible with switching branches. > > (but if I provide the filenames to the checkout it will succeed) what I meant was, you shouldn't have to pick the right set of files; just "." and it'll only do this to unmerged files. (Actually stage 1/2/3 is only *defined* for such so it can't do this for merged files anyway) --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
