Re: theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy

Johannes Schindelin [off-list ref] writes:

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".

I would have expected the one who has the good version to make the choice.

That reminds me of:

    http://thread.gmane.org/gmane.comp.version-control.git/89178

to one of whose messages I sent a response today.