From: H. Peter Anvin <hpa@zytor.com>
Date: Mon, 03 Oct 2005 21:08:36 GMT
Subject: Re: What to expect after 0.99.8
Message-ID: <43419DD4.5040508@zytor.com>
In-Reply-To: <200510032048.37363.alan@chandlerfamily.org.uk>

Alan Chandler wrote:
> 
> I did wonder today in response to a discussion at work about version control 
> of documentation, whether git could in some way understand OpenDocument 
> format and allow some form of merging of concurrent changes to the same 
> document.  I am not sure if just unzipping the files and applying standard 
> merge strategies the resultant xml would be good enough.
> 
> Sadly just a thought at the moment.
> 

I believe in the medium-to-long term a plugin architecture for merging 
is imperative.  It's not even different media types, but some *files* 
have specific merging policies.  Think, for example, of pci.ids in the 
Linux kernel tree.

	-hpa