From: Randal L. Schwartz <merlyn@stonehenge.com>
Date: Thu, 11 Mar 2010 21:16:58 GMT
Subject: Re: Doing a dummy or empty merge
Message-ID: <864okmeeyd.fsf@blue.stonehenge.com>
In-Reply-To: <7vljdyzjsy.fsf@alter.siamese.dyndns.org>

>>>>> "Junio" == Junio C Hamano <gitster@pobox.com> writes:

Junio> After the above "merge -s ours", you obviously can never merge from
Junio> live to test.  You have declared that you favor the live configuration
Junio> over the test configuration with that merge commit, and merging a
Junio> branch that has that merge commit (i.e. live) into any branch
Junio> (i.e. test) is your consent to be bound by that declaration.  The
Junio> resulting backmerge will wipe the test configuration and replace it
Junio> with that from live.

Very good point.  But a cherry-pick would work, right?

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc.
See http://methodsandmessages.vox.com/ for Smalltalk and Seaside discussion