From: "Santi Béjar" <santi@agolina.net>
To: Zenaan Harkness <zen@freedbms.net>
Cc: git@vger.kernel.org
Subject: Re: custom diff - text file diary entries
Date: Thu, 30 Dec 2010 14:47:27 +0100 [thread overview]
Message-ID: <AANLkTinzKdQbMt+4uod05aAWfeK5xJ_JBhQhDaMFsLzy@mail.gmail.com> (raw)
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
prev parent reply other threads:[~2010-12-30 13:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-30 11:33 custom diff - text file diary entries Zenaan Harkness
2010-12-30 12:22 ` Andreas Ericsson
2010-12-30 12:36 ` Zenaan Harkness
2010-12-30 13:47 ` Santi Béjar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTinzKdQbMt+4uod05aAWfeK5xJ_JBhQhDaMFsLzy@mail.gmail.com \
--to=santi@agolina.net \
--cc=git@vger.kernel.org \
--cc=zen@freedbms.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).