threads / discuss / 43563

git-merge-recursive-old?

Subject: git-merge-recursive-old?

## tl;dr

3 messages between Nov 29, 2006 and Nov 29, 2006.

replies: 2people: 2as markdown or json

Randal L. Schwartz· Nov 29, 2006, 14:57 UTC · lore

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

-- 
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.

Johannes Schindelin· Nov 29, 2006, 15:07 UTC · re: Randal L. Schwartz · lore

Re: git-merge-recursive-old?

Hi,

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?

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

Hth, Dscho

Randal L. Schwartz· Nov 29, 2006, 15:09 UTC · re: Johannes Schindelin · lore

Re: git-merge-recursive-old?

>>>>> "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.