From: Zenaan Harkness <zen@freedbms.net>
Date: Thu, 30 Dec 2010 12:36:15 GMT
Subject: Re: custom diff - text file diary entries
Message-ID: <AANLkTinAJ=Dzn6u7Xu=dqkzm+tiB2M_nGE2=EzRDnPEa@mail.gmail.com>
In-Reply-To: <4D1C7979.9050400@op5.se>

On Thu, Dec 30, 2010 at 23:22, Andreas Ericsson <ae@op5.se> wrote:
> On 12/30/2010 12:33 PM, Zenaan Harkness wrote:
>> Problem:
>> Separate text file diary entries, committed in separate repos,
>> cause merge clash when pushed to central repo,
>> since git thinks the two entries are a single conflicting entry
>> (since they begin at the same location in the same file).
>>
>> What we need is two diary entries automatically detected and inserted
>> into the one file, one above the other (ordering is not so important).
...
> If you really, really want to use git for this, you could create your
> own custom merge driver. How to do so is reasonably well documented in
> examples and man-pages. You'll want to sneak a peak at the attributes
> page.

"custom merge driver .. attributes page"

Thank you very much for these pointers,
Zen