On Fri, Oct 24, 2014 at 8:36 AM, Leo Simons <lsim...@schubergphilis.com> wrote: > Hey Mike, > > In git you accomplish these kinds of things with merge strategies. There’s a > lot to choose from. What you’re describing sounds a bit like a variant on the > “theirs” strategy. ... doh, will give it another spin. I used 'ours' instead or 'recursive -X ours'. I think that is what we want except in Mikes usecase where we would, knowing that there is only this commit to ignore, use 'ours'.
-- Daan
