![](bgb.png)
DiffDog (2007). http://www.altova.com/products/diffdog/
diff merge tool.html.
Diffutils - GNU Project (2007). http://
www.gnu.org/software/diffutils/.
ExamDiff Pro (2007). http://www.prestosoft.com/ps.asp?
page=edp examdiffpro.
Greenberg, S. and Roseman, M. (2003). Using a room
metaphor to ease transitions in groupware. In Acker-
mann, M., Pipek, V., and Wulf, V., editors, Sharing
Expertise: Beyond Knowledge Management, pages
203–256. MIT Press, Cambridge, MA, USA.
Guiffy (2007). http://www.guiffy.com/.
Haake, J. M., Haake, A., Sch
¨
ummer, T., Bourimi, M.,
and Landgraf, B. (2004a). End-user controlled group
formation and access rights management in a shared
workspace system. In CSCW ’04: Proceedings of the
2004 ACM conference on Computer supported coop-
erative work, pages 554–563. ACM Press, New York,
NY, USA.
Haake, J. M., Haake, A., Sch
¨
ummer, T., and Lukosch, S.
(2005). Collaborative learning at a distance with the
project method. Educational Technology, 45(5):21–
24.
Haake, J. M., Sch
¨
ummer, T., Haake, A., Bourimi, M., and
Landgraf, B. (2003). Two-level tailoring support for
CSCL. In Favela, J. and Decouchant, D., editors,
Groupware: Design, Implementation, and Use, 9th
International Workshop, CRIWG 2003, LNCS 2806,
pages 74–82. Springer-Verlag Berlin Heidelberg.
Haake, J. M., Sch
¨
ummer, T., Haake, A., Bourimi, M., and
Landgraf, B. (2004b). Supporting flexible collabora-
tive distance learning in the CURE platform. In Pro-
ceedings of the Hawaii International Conference On
System Sciences (HICSS-37). IEEE Press.
Hunt, J. W. and McIlroy, M. D. (1976). An algorithm for
differential file comparison. Computing Science Tech-
nical Report 41, Bell Laboratories.
KDiff (2007).http://kdiff3.sourceforge.net/.
Leuf, B. and Cunningham, W. (2001). The WIKI way.
Addison-Wesley, Boston, MA, USA.
Lukosch, S. (2008). Seamless transition between connected
and disconnected collaborative interaction. Journal of
Universal Computer Science (JUCS), Special Issue on
’Groupware: Issues and Applications’.
Lukosch, S., Hellweg, M., and Rasel, M. (2006). CSCL,
Anywhere and Anytime. In Dimitriadis, Y. A., Zig-
urs, I., and G
´
omez-S
´
anchez, E., editors, Groupware:
Design, Implementation, and Use, 12th International
Workshop, CRIWG 2006, LNCS 4154, pages 326–
340. Springer-Verlag Berlin Heidelberg.
Lukosch, S. and Sch
¨
ummer, T. (2006). Making exam prepa-
ration an enjoyable experience. International Jour-
nal of Interactive Technology and Smart Education,
Special Issue on ’Computer Game-based Learning’,
3(4):259–274.
Meld (2007). http://meld.sourceforge.net/.
Myers, E. W. (1986). An O(ND) difference algorithm and
its variations. Algorithmica, 1(2):251–266.
Pfister, H.-R., Schuckmann, C., Beck-Wilson, J., and Wess-
ner, M. (1998). The metaphor of virtual rooms in the
cooperative learning environment CLear. In Streitz,
N., Konomi, S., and Burkhardt, H., editors, Coopera-
tive Buildings - Integrating Information, Organization
and Architecture. Proceedings of CoBuild’98, LNCS
1370, pages 107–113. Springer Heidelberg.
Rick, J., Guzdial, M., Carroll, K., Holloway-Attaway, L.,
and Walker, B. (2002). Collaborative learning at low
cost: CoWeb use in english composition. In Proceed-
ings of CSCL 2002, Boulder, Colorado, USA.
Sch
¨
ummer, T. and Fernand
´
ez, A. (2006). Patterns for virtual
places. pages 35–74. UVK Universit
¨
atsverlag Kon-
stanz GmbH.
Sch
¨
ummer, T. and Lukosch, S. (2007a). Patterns for
Computer-Mediated Interaction. John Wiley & Sons,
Ltd.
Sch
¨
ummer, T. and Lukosch, S. (2007b). READ.ME – Talk-
ing about computer-mediated communication. pages
317–342. UVK Universit
¨
atsverlag Konstanz GmbH.
Sch
¨
ummer, T., Lukosch, S., and Haake, J. M. (2005).
Teaching distributed software development with the
project method. In Koschmann, T., Suthers, D. D.,
and Chan, T.-W., editors, Computer Supported Col-
laborative Learning 2005: The Next 10 Years!, pages
577–586. Lawrence Erlbaum Associates.
Tichy, W. F. (1985). RCS – a system for version control.
Software Practice and Experience, 15(7):637–654.
TkDiff (2007). http://sourceforge.net/projects/tkdiff/.
Wiki Choicetree (2007). http://c2.com/cgi/
wiki?WikiChoicetree.
Wikipedia (2007). Main page – wikipedia, the free ency-
clopedia. (Online; Stand 24. April 2007).
WinMerge (2007). http://winmerge.org/2.6/manual/.
Yang, W. (1991). Identifying syntactic differences between
two programs. Software-Practice and Experience,
21(7):739–755.
DEALING WITH CONFLICTING MODIFICATIONS IN A WIKI
15