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

Junio C Hamano [off-list ref] writes:

"Sverre Rabbelier" [off-list ref] writes:

quoted

On Mon, Jul 28, 2008 at 22:20, Junio C Hamano [off-list ref] wrote:

quoted

"Sverre Rabbelier" [off-list ref] writes:

quoted

Mhhh, but the proposed strategy there was in response to the 'insane'
git-merge-theirs version, not to the 'exact opposite of
git-merge-ours' that I refer to now, yes?

No.

Nanako Shiraishi's patch was not in response to the "git-merge-theirs"
thread, or I am missing something here....?

The quoted sentence by me in that message was after I explained why "per
hunk theirs" aka "-Xtheirs" was not such a great idea I further went on to
say "by the way, '-s theirs' is even worse and here is why".

Heh, I ended up doing the "digging" myself.   The quote came from this:

    http://thread.gmane.org/gmane.comp.version-control.git/89010/focus=89024

and "tried not to sound too negative" there refers to:

    http://thread.gmane.org/gmane.comp.version-control.git/89010/focus=89021

which _was_ about the "-Xtheirs", not "-s theirs".

On Mon, Jul 28, 2008 at 23:35, Junio C Hamano [off-list ref] wrote:

Junio C Hamano [off-list ref] writes:

quoted

The quoted sentence by me in that message was after I explained why "per
hunk theirs" aka "-Xtheirs" was not such a great idea I further went on to
say "by the way, '-s theirs' is even worse and here is why".

Aaah, ok, now I see where my confusion came from. Thank you for
clarifying that. Then remains the question, what to tell those that
want '-s theirs' not to keep track of their changes, but to keep a
fast-forwardable master?

Heh, I ended up doing the "digging" myself.   The quote came from this:

   http://thread.gmane.org/gmane.comp.version-control.git/89010/focus=89024

and "tried not to sound too negative" there refers to:

   http://thread.gmane.org/gmane.comp.version-control.git/89010/focus=89021

which _was_ about the "-Xtheirs", not "-s theirs".

Understood, it makes sense now.

-- 
Cheers,

Sverre Rabbelier