News for hackers. Stuff that matters.
Re:A version-controlled object database with real-time colla... by qmathe on Wednesday June 04, 2014 @07:29AM (#7844961)
For a more complex merge, you can take a look at the 'Branching' video, near the end, we show a merge between two branches in a graphics editor.

We also give a brief overview of the Diff/Merge model here: http://coreobject.org/technotes/#diffmerge

There are no comments on this comment yet.