On Thu, Dec 30, 2010 at 23:22, Andreas Ericsson <ae@xxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html