Academia.eduAcademia.edu

Fig. 1. Version management in the group editor - during partition  Figures 1 and 2 show an example with three users during and after a network partition: The initial state of the document was ‘x’. Then a network failure sep- arated Site 3 from Sites 1 and 2. In every partition an update was carried out (leading to state ‘y’ in one partition and to state ‘z’ in the other partition). After that update User 2 changed the ‘y’ to ‘p’ as private update (Fig. 1). Then the net- work failure that caused the partition disappeared and the sites exchanged their information. The conflict was recognized (branch in version trees) but the display did not change (Fig. 2). The authors have to resolve the conflict by merging the different versions later.

Figure 1 Version management in the group editor - during partition Figures 1 and 2 show an example with three users during and after a network partition: The initial state of the document was ‘x’. Then a network failure sep- arated Site 3 from Sites 1 and 2. In every partition an update was carried out (leading to state ‘y’ in one partition and to state ‘z’ in the other partition). After that update User 2 changed the ‘y’ to ‘p’ as private update (Fig. 1). Then the net- work failure that caused the partition disappeared and the sites exchanged their information. The conflict was recognized (branch in version trees) but the display did not change (Fig. 2). The authors have to resolve the conflict by merging the different versions later.