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, 17:21 UTC
Message-ID
<86wrxiepv3.fsf@blue.stonehenge.com>
In-Reply-To
<8440EA2C12E50645A68C4AA9887166513FC480@SERVER.webdezign.local>
>>>>> "Richard" == Richard Lee <richard@webdezign.co.uk> writes:

Richard> At this point I want to merge this test branch into the live branch Richard> despite not having made any commits apart from deployment related Richard> changes on the test branch. I want this to be a dummy merge so that a Richard> merge is recorded into the live branch, but the contents of the live Richard> branch remain untouched. This is as if I made an empty commit on the Richard> live branch.

I think you'll get what you want with a "merge -s ours" from test to live. That says that "I've looked at test, and I've looked at the parents of live, and this is how I want the result to look".

Further commits on test can then be merged to live automatically using this new merge as the (initial) base. Of course, later commits after that will use subsequent bases, but that should already work the way you want.

-- 
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: Richard LeeNext: Junio C Hamano
Message 2 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.