ICSE 2025
Sat 26 April - Sun 4 May 2025 Ottawa, Ontario, Canada

This dissertation addresses the limitations of convergence in near-synchronous code collaboration environments. Current techniques predominantly rely on string-based synchronization, which often results in conflict resolution that fails to preserve the intentions of collaborators. This work proposes a semantic-aware approach that explores different levels of granularity in replicated data types (RDT) to overcome these limitations while enabling near-synchronous visualization of code evolution, enhancing interactive programming environments. The main contributions include: (1) a specification for intent-preserving code merging behavior, (2) a novel RDT approach exploring different granularity levels, (3) near-synchronous visualization of code semantics, and (4) extended RDT approaches utilizing nested replicated data types for improved conflict resolution in educational programming contexts.