Towards understanding and fixing upstream merge induced conflicts in divergent forks: an industrial case study. - Chungha Sung; Shuvendu K. Lahiri; Mike Kaufman; Pallavi Choudhury; Chao Wang 001 (ICSE (SEIP), 2020)

Towards understanding and fixing upstream merge induced conflicts in divergent forks: an industrial case study. - Chungha Sung; Shuvendu K. Lahiri; Mike Kaufman; Pallavi Choudhury; Jessica Wolk; Chao Wang 001 (ICSE (Companion Volume), 2020)

Can Program Synthesis be Used to Learn Merge Conflict Resolutions? An Empirical Analysis. - Rangeet Pan; Vu Le 002; Nachiappan Nagappan; Sumit Gulwani; Shuvendu K. Lahiri; Mike Kaufman (ICSE, 2021)

Can Pre-trained Language Models be Used to Resolve Textual and Semantic Merge Conflicts? - Jialu Zhang 002; Todd Mytkowicz; Mike Kaufman; Ruzica Piskac; Shuvendu K. Lahiri (CoRR, 2021)

Using pre-trained language models to resolve textual and semantic merge conflicts (experience paper). - Jialu Zhang 002; Todd Mytkowicz; Mike Kaufman; Ruzica Piskac; Shuvendu K. Lahiri (ISSTA, 2022)