Thread (14 messages) flat view 14 messages, 12 authors, 2016-06-15

Re: What to expect after 0.99.8

From: "H. Peter Anvin" <hpa@zytor.com>
Date: 2016-06-15 22:42:07

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help