Taxonomy on Software Engineering Grouphttps://seg.inf.unibe.ch/keywords/taxonomy/Recent content in Taxonomy on Software Engineering GroupHugoen-USSoftware Engineering Group (SEG), [Institute of Computer Science](https://www.inf.unibe.ch/), [University of Bern](https://www.unibe.ch/). All rights reserved.Understanding Semantic Change Interactions in Merge Conflictshttps://seg.inf.unibe.ch/teaching/student-projects/current/t0085-merge-conflict-semantic-interactions/Mon, 01 Jan 0001 00:00:00 +0000https://seg.inf.unibe.ch/teaching/student-projects/current/t0085-merge-conflict-semantic-interactions/This project investigates merge conflicts at this semantic level. It aims to characterize (1) the semantic changes represented by <code>ours</code> and <code>theirs</code>, (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.