W3C home > Mailing lists > Public > ietf-dav-versioning@w3.org > January to March 2007

Merge conflicts

From: Werner Donné <werner.donne@re.be>
Date: Mon, 05 Feb 2007 12:01:51 +0100
Message-ID: <45C70E9F.4060407@re.be>
To: ietf-dav-versioning@w3.org

Hi,

If a merge request allows for automatic merging of documents
and if the server has this possibility for a certain type
of documents, it can happen that the automatic merge module
detects conflicts.

Is it allowed to update the "merge-set" property in this case
instead of the "auto-merge-set" property?

And is it then allowed to update the body of the checked-out
resource in such a way that a client can present the result
to the user and let him make the choices to resolve the
conflicts? The automatic merge module would of course have to
document what it generates in such a case.

The use case for this is when the merge software is not
available to the client, but only to the server.

Regards,

Werner.
-- 
Werner Donné  --  Re
Engelbeekstraat 8
B-3300 Tienen
tel: (+32) 486 425803	e-mail: werner.donne@re.be
Received on Monday, 5 February 2007 11:03:56 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 8 January 2008 13:57:44 GMT