Wikis are one of the most important tools of Web 2.0 allowing users to easily edit shared data. However, wikis offer limited support for merging concurrent contributions on the same pages. Users have to manually merge concurrent changes, and there is no support for an automatic merging. Real-time collaborative editing reduces conflicts as the time frame for concurrent work is very short. In this paper, we propose extending wiki systems with real-time collaboration. We propose an automatic merging solution adapted for rich content wikis. Our solution relies on an operational transformation algorithm defined for high level operations that capture user actions such as move, merge, and split.
展开▼