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

Re: Merging to and from non-current branches.

From
Randal L. Schwartz <merlyn@stonehenge.com>
Date
Aug 6, 2009, 02:15 UTC
Message-ID
<86y6pxsn6h.fsf@blue.stonehenge.com>
In-Reply-To
<C766A4F9-C12B-4F94-8B24-9BD3665B70E8@mgreg.com>
>>>>> "mgreg" == lists@mgreg com <lists@mgreg.com> writes:

mgreg> As I said, I understand what is being said, but in IMHO it would seem mgreg> that a merge of that nature would be immediately desirable. Think of mgreg> it more as a local "push". I'm never a fan of "because it hasn't be mgreg> done means it shouldn't be". I realize that's not exactly what you're mgreg> saying though. Anyway, I absolutely appreciate the post, and may very mgreg> well post the script.

In other words, you'd be happy with it if it was just a fast-forward only?

Because the moment you might have conflicts, that *has* to be the workdir so you can resolve those conflicts. Dunno why this is so hard to grok.

-- 
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: lists@mgreg.comNext: Daniel Barkalow
Message 8 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.