Almost Rerere: Learning to resolve conflicts in distributed projects
SLH Gonzalez, P Fraternali - IEEE Transactions on Software …, 2022 - ieeexplore.ieee.org
The concurrent development of applications requires reconciling conflicting code updates by
different developers. Recent research on the nature of merge conflicts in open source …
different developers. Recent research on the nature of merge conflicts in open source …
[PDF][PDF] Improving code merging accuracy with transformations and member identity
ADR Teles - 2023 - repositorio.iscte-iul.pt
Conventionally, merging code files is performed in an unstructured manner, using generic
linebased merging algorithms (eg, diff3) that are unaware of the syntax and semantics of the …
linebased merging algorithms (eg, diff3) that are unaware of the syntax and semantics of the …