On Fri, Jul 10, 2009 at 12:30 AM, Peter Shenkin<[email protected]> wrote:
> Is there a way I can tell the master to ignore the changes that would > have been merged, without having first gone through the trouble of > carrying out a successful merge, then reverting it? "git merge -s ours" maybe? [or I misunderstood the whole thing!] --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
