{"status":"ok","message-type":"work","message-version":"1.0.0","message":{"indexed":{"date-parts":[[2026,3,13]],"date-time":"2026-03-13T04:12:38Z","timestamp":1773375158708,"version":"3.50.1"},"publisher-location":"New York, NY, USA","reference-count":2,"publisher":"ACM","license":[{"start":{"date-parts":[[2020,6,27]],"date-time":"2020-06-27T00:00:00Z","timestamp":1593216000000},"content-version":"vor","delay-in-days":0,"URL":"https:\/\/www.acm.org\/publications\/policies\/copyright_policy#Background"}],"content-domain":{"domain":["dl.acm.org"],"crossmark-restriction":true},"short-container-title":[],"published-print":{"date-parts":[[2020,6,27]]},"DOI":"10.1145\/3377812.3390800","type":"proceedings-article","created":{"date-parts":[[2020,10,1]],"date-time":"2020-10-01T22:53:56Z","timestamp":1601592836000},"page":"320-321","update-policy":"https:\/\/doi.org\/10.1145\/crossmark-policy","source":"Crossref","is-referenced-by-count":1,"title":["Towards understanding and fixing upstream merge induced conflicts in divergent forks"],"prefix":"10.1145","author":[{"given":"Chungha","family":"Sung","sequence":"first","affiliation":[{"name":"University of Southern California"}]},{"given":"Shuvendu K.","family":"Lahiri","sequence":"additional","affiliation":[{"name":"Microsoft Corporation"}]},{"given":"Mike","family":"Kaufman","sequence":"additional","affiliation":[{"name":"Microsoft Corporation"}]},{"given":"Pallavi","family":"Choudhury","sequence":"additional","affiliation":[{"name":"Microsoft Corporation"}]},{"given":"Jessica","family":"Wolk","sequence":"additional","affiliation":[{"name":"Microsoft Corporation"}]},{"given":"Chao","family":"Wang","sequence":"additional","affiliation":[{"name":"University of Southern California"}]}],"member":"320","published-online":{"date-parts":[[2020,10]]},"reference":[{"key":"e_1_3_2_1_1_1","volume-title":"Proactive Detection of Collaboration Conflicts. In ACM SIGSOFT Symposium on Foundations of Software Engineering. 168--178","author":"Brun Y.","unstructured":"Y. Brun , R. Holmes , M. D. Ernst , and D. Notkin . 2011 . Proactive Detection of Collaboration Conflicts. In ACM SIGSOFT Symposium on Foundations of Software Engineering. 168--178 . Y. Brun, R. Holmes, M. D. Ernst, and D. Notkin. 2011. Proactive Detection of Collaboration Conflicts. In ACM SIGSOFT Symposium on Foundations of Software Engineering. 168--178."},{"key":"e_1_3_2_1_2_1","volume-title":"Moving Between Private and Public Work in Collaborative Software Development. In International ACM SIGGROUP Conference on Supporting Group Work. 105--114","author":"de Souza C. R. B.","unstructured":"C. R. B. de Souza , D. Redmiles , and P. Dourish . 2003. \"Breaking the Code \", Moving Between Private and Public Work in Collaborative Software Development. In International ACM SIGGROUP Conference on Supporting Group Work. 105--114 . C. R. B. de Souza, D. Redmiles, and P. Dourish. 2003. \"Breaking the Code\", Moving Between Private and Public Work in Collaborative Software Development. In International ACM SIGGROUP Conference on Supporting Group Work. 105--114."}],"event":{"name":"ICSE '20: 42nd International Conference on Software Engineering","location":"Seoul South Korea","acronym":"ICSE '20","sponsor":["SIGSOFT ACM Special Interest Group on Software Engineering","KIISE Korean Institute of Information Scientists and Engineers","IEEE CS"]},"container-title":["Proceedings of the ACM\/IEEE 42nd International Conference on Software Engineering: Companion Proceedings"],"original-title":[],"link":[{"URL":"https:\/\/dl.acm.org\/doi\/10.1145\/3377812.3390800","content-type":"unspecified","content-version":"vor","intended-application":"text-mining"},{"URL":"https:\/\/dl.acm.org\/doi\/pdf\/10.1145\/3377812.3390800","content-type":"unspecified","content-version":"vor","intended-application":"similarity-checking"}],"deposited":{"date-parts":[[2025,6,17]],"date-time":"2025-06-17T22:38:42Z","timestamp":1750199922000},"score":1,"resource":{"primary":{"URL":"https:\/\/dl.acm.org\/doi\/10.1145\/3377812.3390800"}},"subtitle":["an industrial case study"],"short-title":[],"issued":{"date-parts":[[2020,6,27]]},"references-count":2,"alternative-id":["10.1145\/3377812.3390800","10.1145\/3377812"],"URL":"https:\/\/doi.org\/10.1145\/3377812.3390800","relation":{},"subject":[],"published":{"date-parts":[[2020,6,27]]},"assertion":[{"value":"2020-10-01","order":2,"name":"published","label":"Published","group":{"name":"publication_history","label":"Publication History"}}]}}