This project investigates merge conflicts at this semantic level. It aims to characterize (1) the semantic changes represented by
oursandtheirs, (2) the relationship between these concurrent changes, and (3) how the final resolution consolidates them. The result should be an empirically grounded taxonomy and an annotated dataset of real-world merge conflicts.