git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: custom diff - text file diary entries

From
ZHZenaan Harkness <zen@freedbms.net>
Date
Dec 30, 2010, 12:36 UTC
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:
Show 9 quoted lines
> 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

Previous: Andreas EricssonNext: Santi Béjar
Message 3 of 4 in “custom diff - text file diary entries”
  1. Zenaan HarknessDec 30, 2010
  2. Andreas EricssonDec 30, 2010
  3. Zenaan HarknessDec 30, 2010
  4. Santi BéjarDec 30, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.