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

Re: Merging to and from non-current branches.

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 6, 2009, 18:43 UTC
Message-ID
<7vprb8lr5n.fsf@alter.siamese.dyndns.org>
In-Reply-To
<alpine.LNX.2.00.0908061320030.2147@iabervon.org>
Daniel Barkalow <barkalow@iabervon.org> writes:
Show 6 quoted lines
>> As I said, I understand what is being said, but in IMHO it would seem that a
>> merge of that nature would be immediately desirable.  Think of it more as a
>> local "push".
>
> You mean like "git push . dev:master"? That does work in the case where a 
> content merge is not required (although not otherwise).
Just to clarify.

It works _only_ when the push is a fast forward, i.e. where a merge is not required.

That is different from working in a case "where a content merge is not required".

The word "content merge" is often used in contrast to "tree level merge", meaning the latter can be finished by flipping stages inside the index by the three-way read-tree (--aggressive) while the former needs to call out to "merge-one-file".

But the push will be rejected if you need _any_ kind of merge.
Previous: Daniel BarkalowNext: Steffen Siebert
Message 10 of 11 in “Merging to and from non-current branches.”
  1. lists@mgreg.comAug 4, 2009
  2. Daniel BarkalowAug 5, 2009
  3. lists@mgreg.comAug 5, 2009
  4. Adam BrewsterAug 5, 2009
  5. Sverre RabbelierAug 5, 2009
  6. Alex RiesenAug 5, 2009
  7. lists@mgreg.comAug 6, 2009
  8. Randal L. SchwartzAug 6, 2009
  9. Daniel BarkalowAug 6, 2009
  10. Junio C HamanoAug 6, 2009
  11. Steffen SiebertAug 6, 2009

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.