{"thread":{"id":"43563","subject":"git-merge-recursive-old?","startedAt":"2006-11-29T14:57:36Z","lastAt":"2006-11-29T15:09:06Z","messageCount":3,"participants":["Randal L. Schwartz","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"295553","messageId":"868xhuxpun.fsf@blue.stonehenge.com","threadId":"43563","inReplyTo":null,"subject":"git-merge-recursive-old?","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2006-11-29T14:57:36Z","receivedAt":"2006-11-29T14:57:36Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":"\nI build daily, and apaprently I built git-merge-recursive-old,\nbut it's not in .gitignore.  Needs to be added, no?\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>\nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\n"},{"id":"296914","messageId":"Pine.LNX.4.63.0611291606410.30004@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43563","inReplyTo":"868xhuxpun.fsf@blue.stonehenge.com","subject":"Re: git-merge-recursive-old?","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-11-29T15:07:45Z","receivedAt":"2006-11-29T15:07:45Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 29 Nov 2006, Randal L. Schwartz wrote:\n\n> I build daily, and apaprently I built git-merge-recursive-old,\n> but it's not in .gitignore.  Needs to be added, no?\n\nTo the contrary. You need to remove it: v1.4.4-g7cdbff1 removed it, but \nyou still have the generated file...\n\nHth,\nDscho\n"},{"id":"297360","messageId":"86zmaawar1.fsf@blue.stonehenge.com","threadId":"43563","inReplyTo":"Pine.LNX.4.63.0611291606410.30004@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: git-merge-recursive-old?","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2006-11-29T15:09:06Z","receivedAt":"2006-11-29T15:09:06Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":">>>>> \"Johannes\" == Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\nJohannes> Hi,\nJohannes> On Wed, 29 Nov 2006, Randal L. Schwartz wrote:\n\n>> I build daily, and apaprently I built git-merge-recursive-old,\n>> but it's not in .gitignore.  Needs to be added, no?\n\nJohannes> To the contrary. You need to remove it: v1.4.4-g7cdbff1 removed it, but \nJohannes> you still have the generated file...\n\nyes, I see that now.  It's too bad there's no mechanism for git to inform\ntrackers that this is not a mistake, but merely human action required.  I\ncan't immediately think of any way to do it though.\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>\nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\n"}]}