From: walt <wa1ter@myrealbox.com>
Date: Fri, 19 Oct 2007 01:00:58 GMT
Subject: Re: git-merge: need a tap with the cluestick, please
Message-ID: <ff8vj9$rs4$1@ger.gmane.org>
In-Reply-To: <20071018233518.GL14735@spearce.org>

Shawn O. Pearce wrote:
> walt <wa1ter@myrealbox.com> wrote:
>> Now when I pull from Linus the merge stops in the middle because of
>> conflicts with my .gitignore file <sigh>.  Anything I try now with
>> git-merge tells me I can't do that in the middle of a conflicted
>> merge.  Yes, I know that now, but what should I do instead?
>>
>> I could move my 'obj' out-of-tree but then I wouldn't learn anything.
>> This has to be bone-head easy, but not for me :)
> 
> How about putting the ignore for your obj dir in your own private
> exclude file:
> 
>   $ echo /obj >>.git/info/exclude
> 
> will cause Git to ignore an "obj" directory if it is found in the
> top level of the repository.  And since this file is not actually
> tracked as part of the repository it will apply to all branches
> in this repository and won't cause merge conflicts when upstream
> makes changes to .gitignore.

Thanks to both you and Lars, who gave me the same advice off-list.
I will do exactly that.

Just to illustrate how much of life depends on blind luck, both good
and bad, I'll explain what really got me in trouble here.  On the
very first pull from Linus after I added my obj directory to
.gitignore -- I pulled this commit:

commit 9e447a7f1fd997bcb9266899e777c37469245365
Author: Denis V. Lunev <den@openvz.org>
Date:   Tue Oct 16 11:22:21 2007 +0400

     .gitignore update for x86 arch
     This patch: - makes .gitignore files visible to git

I'd like to think that if I'd made my changes on *any* other day
but yesterday I wouldn't have been so completely confused by what
happened.  (But perhaps I flatter myself :o)

Thanks again.