If two users check out a file from a configuration management system, edit their local copies, and submit their modified versions back into the system, a merge action must occur. This project involves taking in three elements: a base version of a file and two modified versions of the file; the program should then output a resultant file that is a best approximation of the non-destructive merge of the modified versions.
Many merge algorithms currently exist, so this project involves researching the current state of the field and implementing a proof-of-concept for a new algorithm that leverages existing techniques.
Customer Contact Information
Jon A. Preston
IT Department
CCSU
(770) 960 4354