From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 01 Oct 2007 13:57:52 GMT
Subject: Re: merging .gitignore
Message-ID: <Pine.LNX.4.64.0710011457120.28395@racer.site>
In-Reply-To: <20071001130314.GA5932@lapse.madduck.net>

Hi,

On Mon, 1 Oct 2007, martin f krafft wrote:

> Feature branch A has a .gitignore file, and it's been merged into
> master for a while. Today, feature branch B failed to merge into
> master because it also provides a .gitignore file.

You might be interested in writing a merge driver.  See 
Documentation/gitattributes.txt.

Hth,
Dscho