On Wed, Jun 12, 2013 at 8:19 PM, Joseph Gentle <jose...@gmail.com> wrote:
> Yep. Similar but better, because using OT we can guarantee eventual > consistency we don't need conflict markers and there's a bunch of > edge cases darcs can't handle. > > I was under the impression that darcs could handle all edge cases that even git can't handle (e.g. the 'bug' where merging patch-by-patch in git can result in different final status, than merging several patches at once), and actually that darcs had no known edge cases. Also, you mention that using OT you don't need conflict markers. Does this mean that OT guarantees no conflicts at all, ever? If so, and this is just pure curiosity, does this mean that OT could be the ultimate underlying system to use by distributed version control systems? -- Saludos, Bruno González _______________________________________________ Jabber: stenyak AT gmail.com http://www.stenyak.com