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). > > Desired outcome: > Two new diary entries - two separate insertions into the text file, > not the conflict. > > Is there an easy way I can automate this diary entry merging, so my > users don't have to manually resolve the conflict? > > Please note: SOMETIMES, one user will go and correct spelling and/ or > grammar fixes in another person's diary entry, or in their own older > diary entry - this is quite common. > It seems like what you really need is a database backend for this that you simply take normal backups from every once in a while, or a script that produces the desired output on the fly from many different files. 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. -- Andreas Ericsson andreas.ericsson@xxxxxx OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 Considering the successes of the wars on alcohol, poverty, drugs and terror, I think we should give some serious thought to declaring war on peace. -- 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