Toward Optimistic Version Control in Architecture

Diffing, Patching, and Three-Way Merging for openNURBS 3D Models

Acknowledgements

I would like to express my gratitude to my advisor, Jefferson Ellinger, and committee members John Gero and Jonathan Dessi-Olive for generously sharing their time and wisdom over the past several months. I would also like to recognize former advisor Dr. Dimitris Papanikolaou, who pushed me to greater levels of academic rigor than I had dreamed possible, as well as Eric Sauda and Dr. Mirsad Hadžikadić, who provided invaluable guidance during the earliest stages of this thesis.

Additionally, I would like to thank the following current and former members of the faculty and staff of the School of Architecture for their support and mentorship over the past eighteen years: