From: Sverre Rabbelier Date: Mon, 28 Jul 2008 19:52:38 GMT Subject: Re: theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy Message-ID: In-Reply-To: On Mon, Jul 28, 2008 at 21:09, Johannes Schindelin wrote: > Well, I have to say that the workflow is a bit backwards if the person who > _publishes_ the thing is the one saying "Ooops, my version no goodie, > other version please, but so that pull still works". Why so? In this case the other branch was also owned by the publishing person. I don't quite follow how this is any stranger than ours? (Which is stranger to me, why would you want to merge in a branch if you're not going to do anything with it anyway? I'm sure there are valid workflows for it, which is why we have it, just saying that I think 'theirs' makes more sense to me than 'ours') > I would have expected the one who has the good version to make the choice. Why have the person with the good version merge with... a bad version? Isn't it usually "I will merge with you, because I know your branch makes things go twice as fast" (paraphrasing Linus from his git talk at google). -- Cheers, Sverre Rabbelier