Three Way Merge

The readings for this class are about three-way merge; a merge where there is one original and then it's modified by two different people. We'll be looking at it from two different perspectives:

Jonathan P. Munson, Prasun Dewan: A Flexible Object Merging Framework. CSCW 1994: 231-242. We're reading this paper because it is a great treatment of why three-way merge is a problem and some of the options from a computer supported collaborative work point of view.
S. Balasubramaniam, Benjamin C. Pierce: What is a File Synchronizer? MOBICOM 1998: 98-108. We are reading this paper gives a mobile computing spin on the problem.

Both papers should be fairly straightforward to read. Pierce has a heavily theory-oriented background, so you may get a little tripped up on the details of the logic. Don't worry about the logic formulas overly unless not understanding them prevents you from understanding the rest of the paper.

WebCT discussions

[534A home] [grading] [schedule][project]

Rachel Pottinger
E-mail Address: rap [at] cs [dot] ubc [dot] ca

Office Location: CICSR 393
Phone: (604)822-0436
Fax:(604)822-5485
Postal/Courier address:
The Department of Computer Science
University of British Columbia
201-2366 Main Mall
Vancouver, B.C. V6T 1Z4
Canada