resolve conflicts with multiple persons

[Ike Casteleyn]

Hi,
We are undertaking a major merge between 2 branches (read: a few years apart).To make this 'easier' we want to resolve the conflicts with multiple persons (instead of one poor soul doing all the work).
First possibility:Commit the merge with all unresolved conflicts and then each developer can resolve conflicts on his machine.We communicate who resolves which files.Commiting unresolved conflicts isn't allowed, so this possibility isn't possible.
Second possibility:I created a clone on a shared folder and did the merge there.We don't need to commit, but each developer can resolve conflicts in the shared location (again communicating who resolves which files).Problem here is that the working copy gets locked when you open a file in mergetool and all other devs need to wait now.Perhaps I could delete the wlock file to get passed this, but that seems 'dangerous'.
Is it possible to do this in a safe way?Or if not possible in a safe way, in an unsafe way (and what would the risks be then)?
Thanks,Ike 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20150707/8e456ada/attachment.html>