From: Santi Béjar <santi@agolina.net>
Date: Thu, 30 Dec 2010 13:47:27 GMT
Subject: Re: custom diff - text file diary entries
Message-ID: <AANLkTinzKdQbMt+4uod05aAWfeK5xJ_JBhQhDaMFsLzy@mail.gmail.com>
In-Reply-To: <AANLkTinAJ=Dzn6u7Xu=dqkzm+tiB2M_nGE2=EzRDnPEa@mail.gmail.com>

On Thu, Dec 30, 2010 at 1:36 PM, Zenaan Harkness <zen@freedbms.net> wrote:
> 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"

Maybe you are interested also in these ChangeLog merge driver for git:

https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools#git-merge-changelog

HTH,
Santi