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

Re: git-merge-recursive-old?

From
Randal L. Schwartz <merlyn@stonehenge.com>
Date
Nov 29, 2006, 15:09 UTC
Message-ID
<86zmaawar1.fsf@blue.stonehenge.com>
In-Reply-To
<Pine.LNX.4.63.0611291606410.30004@wbgn013.biozentrum.uni-wuerzburg.de>
>>>>> "Johannes" == Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Johannes> Hi, Johannes> On Wed, 29 Nov 2006, Randal L. Schwartz wrote:

>> I build daily, and apaprently I built git-merge-recursive-old,
>> but it's not in .gitignore.  Needs to be added, no?

Johannes> To the contrary. You need to remove it: v1.4.4-g7cdbff1 removed it, but Johannes> you still have the generated file...

yes, I see that now. It's too bad there's no mechanism for git to inform trackers that this is not a mistake, but merely human action required. I can't immediately think of any way to do it though.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
Previous: Johannes Schindelin
Message 3 of 3 in “git-merge-recursive-old?”
  1. Randal L. SchwartzNov 29, 2006
  2. Johannes SchindelinNov 29, 2006
  3. Randal L. SchwartzNov 29, 2006

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.