Quoting "Leo Razoumov" <slonik.az@xxxxxxxxx>:
> On 12/2/08, Caleb Cushing <xenoterracide@xxxxxxxxx> wrote:
>> > I guess that "no-overwrite" can be achieved by
>> >
>> > git merge -s ours --no-commit
>>
>> no it doesn't. which is why I called it a bad name. no-overwrite would
>> still add new lines to the file not in ours (and no-commit isn't
>> needed in that case) it just wouldn't overwrite conflicting lines, my
>> understanding of ours is that it will keep the files as is.
Isn't what Caleb wants "-X ours/theirs" per-hunk option for merge strategy backends?
It was discussed several months ago on the list and was rejected. For details you can start here:
http://thread.gmane.org/gmane.comp.version-control.git/89010/focus=89021
I still think the patch in the above link was reasonable, but the thread was distracted into discussing minor syntactical details of how the option gets passed to the backend, and the rest of the discussion to decide if it makes sense to add such a feature was unfortunately lost in the noise and never concluded.
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
