From: Rogan Dawes Date: Fri, 13 Mar 2009 09:41:34 GMT Subject: Re: Google Summer of Code 2009: GIT Message-ID: <49BA2A4E.3030506@dawes.za.net> In-Reply-To: saurabh gupta wrote: >> exactly. and how you mark the conflict to have it be valid XML is >> going to depend on details of the type of file. there are probably >> a few basic methods that will work the vast majority of the time, >> but with some details needing to be configurable. >> >> for example, if the XML document is a ODF document, it may be >> possible to add 'revision' tags around the conflict that are >> already understood by the editor. > > Exactly. This includes the work to modify the xml tags and add > contents to represent marker in the best way. On the XML topic, one last thing to keep in mind is the DTD/XSD which governs the file. Rogan