* git-merge-recursive-old?
@ 2006-11-29 14:57 Randal L. Schwartz
2006-11-29 15:07 ` git-merge-recursive-old? Johannes Schindelin
0 siblings, 1 reply; 3+ messages in thread
From: Randal L. Schwartz @ 2006-11-29 14:57 UTC (permalink / raw)
To: git
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git-merge-recursive-old?
2006-11-29 14:57 git-merge-recursive-old? Randal L. Schwartz
@ 2006-11-29 15:07 ` Johannes Schindelin
2006-11-29 15:09 ` git-merge-recursive-old? Randal L. Schwartz
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Schindelin @ 2006-11-29 15:07 UTC (permalink / raw)
To: Randal L. Schwartz; +Cc: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git-merge-recursive-old?
2006-11-29 15:07 ` git-merge-recursive-old? Johannes Schindelin
@ 2006-11-29 15:09 ` Randal L. Schwartz
0 siblings, 0 replies; 3+ messages in thread
From: Randal L. Schwartz @ 2006-11-29 15:09 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
>>>>> "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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-11-29 15:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-29 14:57 git-merge-recursive-old? Randal L. Schwartz
2006-11-29 15:07 ` git-merge-recursive-old? Johannes Schindelin
2006-11-29 15:09 ` git-merge-recursive-old? Randal L. Schwartz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox