{"status":"ok","message-type":"work","message-version":"1.0.0","message":{"indexed":{"date-parts":[[2024,10,30]],"date-time":"2024-10-30T21:01:44Z","timestamp":1730322104428,"version":"3.28.0"},"publisher-location":"New York, NY, USA","reference-count":26,"publisher":"ACM","content-domain":{"domain":["dl.acm.org"],"crossmark-restriction":true},"short-container-title":[],"published-print":{"date-parts":[[2020,6,27]]},"DOI":"10.1145\/3377813.3381362","type":"proceedings-article","created":{"date-parts":[[2020,9,19]],"date-time":"2020-09-19T00:21:21Z","timestamp":1600474881000},"page":"172-181","update-policy":"http:\/\/dx.doi.org\/10.1145\/crossmark-policy","source":"Crossref","is-referenced-by-count":9,"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":"Chao","family":"Wang","sequence":"additional","affiliation":[{"name":"University of Southern California"}]}],"member":"320","published-online":{"date-parts":[[2020,9,18]]},"reference":[{"volume-title":"Semistructured Merge: Rethinking Merge in Revision Control Systems. In ACM SIGSOFT Symposium on Foundations of Software Engineering. 190--200","author":"Apel S.","key":"e_1_3_2_1_1_1","unstructured":"S. Apel , J. Liebig , B. Brandl , C. Lengauer , and C. K\u00e4stner . 2011 . Semistructured Merge: Rethinking Merge in Revision Control Systems. In ACM SIGSOFT Symposium on Foundations of Software Engineering. 190--200 . S. Apel, J. Liebig, B. Brandl, C. Lengauer, and C. K\u00e4stner. 2011. Semistructured Merge: Rethinking Merge in Revision Control Systems. In ACM SIGSOFT Symposium on Foundations of Software Engineering. 190--200."},{"volume-title":"Proactive Detection of Collaboration Conflicts. In ACM SIGSOFT Symposium on Foundations of Software Engineering. 168--178","author":"Brun Y.","key":"e_1_3_2_1_2_1","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."},{"volume-title":"IEEE International Conference on Software Maintenance and Evolution. 649--649","author":"Collard M. L.","key":"e_1_3_2_1_3_1","unstructured":"M. L. Collard and J. I. Maletic . 2016. srcML 1.0: Explore, Analyze, and Manipulate Source Code . In IEEE International Conference on Software Maintenance and Evolution. 649--649 . M. L. Collard and J. I. Maletic. 2016. srcML 1.0: Explore, Analyze, and Manipulate Source Code. In IEEE International Conference on Software Maintenance and Evolution. 649--649."},{"volume-title":"Recommending Adaptive Changes for Framework Evolution. In International Conference on Software Engineering. 481--490","author":"Dagenais B.","key":"e_1_3_2_1_4_1","unstructured":"B. Dagenais and M. P. Robillard . 2008 . Recommending Adaptive Changes for Framework Evolution. In International Conference on Software Engineering. 481--490 . B. Dagenais and M. P. Robillard. 2008. Recommending Adaptive Changes for Framework Evolution. In International Conference on Software Engineering. 481--490."},{"volume-title":"Imprecisions Diagnostic in Source Code Deltas. In 2018 IEEE\/ACM 15th International Conference on Mining Software Repositories (MSR). 492--502","author":"de la Torre G.","key":"e_1_3_2_1_5_1","unstructured":"G. de la Torre , R. Robbes , and A. Bergel . 2018 . Imprecisions Diagnostic in Source Code Deltas. In 2018 IEEE\/ACM 15th International Conference on Mining Software Repositories (MSR). 492--502 . G. de la Torre, R. Robbes, and A. Bergel. 2018. Imprecisions Diagnostic in Source Code Deltas. In 2018 IEEE\/ACM 15th International Conference on Mining Software Repositories (MSR). 492--502."},{"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.","key":"e_1_3_2_1_6_1","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."},{"volume-title":"IEEE\/ACM International Conference On Automated Software Engineering. 313--324","author":"Falleri J.","key":"e_1_3_2_1_7_1","unstructured":"J. Falleri , F. Morandat , X. Blanc , M. Martinez , and M. Monperrus . 2014. Fine-grained and accurate source code differencing . In IEEE\/ACM International Conference On Automated Software Engineering. 313--324 . J. Falleri, F. Morandat, X. Blanc, M. Martinez, and M. Monperrus. 2014. Fine-grained and accurate source code differencing. In IEEE\/ACM International Conference On Automated Software Engineering. 313--324."},{"volume-title":"Improving Early Detection of Software Merge Conflicts. In International Conference on Software Engineering. 342--352","author":"Guimar\u00e3es M. L.","key":"e_1_3_2_1_8_1","unstructured":"M. L. Guimar\u00e3es and A. R. Silva . 2012 . Improving Early Detection of Software Merge Conflicts. In International Conference on Software Engineering. 342--352 . M. L. Guimar\u00e3es and A. R. Silva. 2012. Improving Early Detection of Software Merge Conflicts. In International Conference on Software Engineering. 342--352."},{"key":"e_1_3_2_1_9_1","doi-asserted-by":"publisher","DOI":"10.1145\/65979.65980"},{"key":"e_1_3_2_1_10_1","doi-asserted-by":"publisher","DOI":"10.1007\/s10515-014-0151-5"},{"volume-title":"ACM SIGSOFT Symposium on Foundations of Software Engineering. 477--487","author":"Linares-V\u00e1squez M.","key":"e_1_3_2_1_11_1","unstructured":"M. Linares-V\u00e1squez , G. Bavota , C. Bernal-C\u00e1rdenas , M. Di Penta , R. Oliveto , and D. Poshyvanyk . 2013. API Change and Fault Proneness: A Threat to the Success of Android Apps . In ACM SIGSOFT Symposium on Foundations of Software Engineering. 477--487 . M. Linares-V\u00e1squez, G. Bavota, C. Bernal-C\u00e1rdenas, M. Di Penta, R. Oliveto, and D. Poshyvanyk. 2013. API Change and Fault Proneness: A Threat to the Success of Android Apps. In ACM SIGSOFT Symposium on Foundations of Software Engineering. 477--487."},{"volume-title":"The Android Update Problem: An Empirical Study. In International Conference on Mining Software Repositories. 220--230","author":"Mahmoudi M.","key":"e_1_3_2_1_12_1","unstructured":"M. Mahmoudi and S. Nadi . 2018 . The Android Update Problem: An Empirical Study. In International Conference on Mining Software Repositories. 220--230 . M. Mahmoudi and S. Nadi. 2018. The Android Update Problem: An Empirical Study. In International Conference on Mining Software Repositories. 220--230."},{"volume-title":"An Empirical Study of API Stability and Adoption in the Android Ecosystem. In IEEE International Conference on Software Maintenance. 70--79","author":"McDonnell T.","key":"e_1_3_2_1_13_1","unstructured":"T. McDonnell , B. Ray , and M. Kim . 2013 . An Empirical Study of API Stability and Adoption in the Android Ecosystem. In IEEE International Conference on Software Maintenance. 70--79 . T. McDonnell, B. Ray, and M. Kim. 2013. An Empirical Study of API Stability and Adoption in the Android Ecosystem. In IEEE International Conference on Software Maintenance. 70--79."},{"volume-title":"ACM SIGPLAN Conference on Programming Language Design and Implementation. 329--342","author":"Meng N.","key":"e_1_3_2_1_14_1","unstructured":"N. Meng , M. Kim , and K. S. McKinley . 2011. Systematic editing: generating program transformations from an example . In ACM SIGPLAN Conference on Programming Language Design and Implementation. 329--342 . N. Meng, M. Kim, and K. S. McKinley. 2011. Systematic editing: generating program transformations from an example. In ACM SIGPLAN Conference on Programming Language Design and Implementation. 329--342."},{"key":"e_1_3_2_1_15_1","doi-asserted-by":"publisher","DOI":"10.1109\/TSE.2002.1000449"},{"volume-title":"Microsoft Edge: Making the web better through more open source collaboration. https:\/\/blogs.windows.com\/windowsexperience\/2018\/12\/06\/.","year":"2018","key":"e_1_3_2_1_16_1","unstructured":"Microsoft. 2018 . Microsoft Edge: Making the web better through more open source collaboration. https:\/\/blogs.windows.com\/windowsexperience\/2018\/12\/06\/. Microsoft. 2018. Microsoft Edge: Making the web better through more open source collaboration. https:\/\/blogs.windows.com\/windowsexperience\/2018\/12\/06\/."},{"key":"e_1_3_2_1_17_1","doi-asserted-by":"publisher","DOI":"10.1145\/2786805.2803208"},{"volume-title":"Proceedings of the 3rd workshop on Programming languages and operating systems: linguistic support for modern operating systems. 10--es.","author":"Padioleau Y.","key":"e_1_3_2_1_18_1","unstructured":"Y. Padioleau , R. R. Hansen , J. L Lawall , and G. Muller . 2006. Semantic patches for documenting and automating collateral evolutions in Linux device drivers . In Proceedings of the 3rd workshop on Programming languages and operating systems: linguistic support for modern operating systems. 10--es. Y. Padioleau, R. R. Hansen, J. L Lawall, and G. Muller. 2006. Semantic patches for documenting and automating collateral evolutions in Linux device drivers. In Proceedings of the 3rd workshop on Programming languages and operating systems: linguistic support for modern operating systems. 10--es."},{"key":"e_1_3_2_1_19_1","doi-asserted-by":"publisher","DOI":"10.1145\/383876.383878"},{"volume-title":"International Conference on Software Engineering. 404--415","author":"Rolim R.","key":"e_1_3_2_1_20_1","unstructured":"R. Rolim , G. Soares , L. D'Antoni , O. Polozov , S. Gulwani , R. Gheyi , R. Suzuki , and B. Hartmann . 2017. Learning Syntactic Program Transformations from Examples . In International Conference on Software Engineering. 404--415 . R. Rolim, G. Soares, L. D'Antoni, O. Polozov, S. Gulwani, R. Gheyi, R. Suzuki, and B. Hartmann. 2017. Learning Syntactic Program Transformations from Examples. In International Conference on Software Engineering. 404--415."},{"key":"e_1_3_2_1_21_1","doi-asserted-by":"publisher","DOI":"10.1145\/1595696.1595747"},{"volume-title":"Understanding and Resolving Build and Test Conflicts. In International Conference on Software Engineering: Companion Proceedings. 192--193","year":"2019","author":"Silva L.","key":"e_1_3_2_1_22_1","unstructured":"L. Silva . 2019 . Detecting , Understanding and Resolving Build and Test Conflicts. In International Conference on Software Engineering: Companion Proceedings. 192--193 . L. Silva. 2019. Detecting, Understanding and Resolving Build and Test Conflicts. In International Conference on Software Engineering: Companion Proceedings. 192--193."},{"volume-title":"Proc. ACM Program. Lang. 2","year":"2018","author":"Sousa M.","key":"e_1_3_2_1_23_1","unstructured":"M. Sousa , I. Dillig , and S. K. Lahiri . 2018. Verified Three-way Program Merge . Proc. ACM Program. Lang. 2 ( 2018 ), 165:1--165:29. M. Sousa, I. Dillig, and S. K. Lahiri. 2018. Verified Three-way Program Merge. Proc. ACM Program. Lang. 2 (2018), 165:1--165:29."},{"key":"e_1_3_2_1_24_1","first-page":"12","article-title":"API-Evolution Support with Diff-CatchUp","volume":"33","author":"Xing Z.","year":"2007","unstructured":"Z. Xing and E. Stroulia . 2007 . API-Evolution Support with Diff-CatchUp . IEEE Trans. Softw. Eng. 33 , 12 (Dec. 2007). Z. Xing and E. Stroulia. 2007. API-Evolution Support with Diff-CatchUp. IEEE Trans. Softw. Eng. 33, 12 (Dec. 2007).","journal-title":"IEEE Trans. Softw. Eng."},{"key":"e_1_3_2_1_25_1","doi-asserted-by":"publisher","DOI":"10.1145\/131736.131756"},{"volume-title":"Mining Workspace Updates in CVS. In International Workshop on Mining Software Repositories. 11--11","year":"2007","author":"Zimmermann T.","key":"e_1_3_2_1_26_1","unstructured":"T. Zimmermann . 2007 . Mining Workspace Updates in CVS. In International Workshop on Mining Software Repositories. 11--11 . T. Zimmermann. 2007. Mining Workspace Updates in CVS. In International Workshop on Mining Software Repositories. 11--11."}],"event":{"name":"ICSE '20: 42nd International Conference on Software Engineering","sponsor":["SIGSOFT ACM Special Interest Group on Software Engineering","KIISE Korean Institute of Information Scientists and Engineers","IEEE CS"],"location":"Seoul South Korea","acronym":"ICSE '20"},"container-title":["Proceedings of the ACM\/IEEE 42nd International Conference on Software Engineering: Software Engineering in Practice"],"original-title":[],"link":[{"URL":"https:\/\/dl.acm.org\/doi\/pdf\/10.1145\/3377813.3381362","content-type":"unspecified","content-version":"vor","intended-application":"similarity-checking"}],"deposited":{"date-parts":[[2023,1,8]],"date-time":"2023-01-08T19:10:44Z","timestamp":1673205044000},"score":1,"resource":{"primary":{"URL":"https:\/\/dl.acm.org\/doi\/10.1145\/3377813.3381362"}},"subtitle":["an industrial case study"],"short-title":[],"issued":{"date-parts":[[2020,6,27]]},"references-count":26,"alternative-id":["10.1145\/3377813.3381362","10.1145\/3377813"],"URL":"https:\/\/doi.org\/10.1145\/3377813.3381362","relation":{},"subject":[],"published":{"date-parts":[[2020,6,27]]},"assertion":[{"value":"2020-09-18","order":2,"name":"published","label":"Published","group":{"name":"publication_history","label":"Publication History"}}]}}