git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Doing a dummy or empty merge

From
Randal L. Schwartz <merlyn@stonehenge.com>
Date
Mar 11, 2010, 21:16 UTC
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
Previous: Junio C HamanoNext: Richard Lee
Message 4 of 5 in “Doing a dummy or empty merge”
  1. Richard LeeMar 11, 2010
  2. Randal L. SchwartzMar 11, 2010
  3. Junio C HamanoMar 11, 2010
  4. Randal L. SchwartzMar 11, 2010
  5. Richard LeeMar 15, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.