{"id":"https://openalex.org/W3011044329","doi":"https://doi.org/10.1145/3377812.3390800","title":"Towards understanding and fixing upstream merge induced conflicts in divergent forks","display_name":"Towards understanding and fixing upstream merge induced conflicts in divergent forks","publication_year":2020,"publication_date":"2020-06-27","ids":{"openalex":"https://openalex.org/W3011044329","doi":"https://doi.org/10.1145/3377812.3390800","mag":"3011044329"},"language":"en","primary_location":{"id":"doi:10.1145/3377812.3390800","is_oa":false,"landing_page_url":"https://doi.org/10.1145/3377812.3390800","pdf_url":null,"source":null,"license":null,"license_id":null,"version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"Proceedings of the ACM/IEEE 42nd International Conference on Software Engineering: Companion Proceedings","raw_type":"proceedings-article"},"type":"article","indexed_in":["crossref"],"open_access":{"is_oa":false,"oa_status":"closed","oa_url":null,"any_repository_has_fulltext":false},"authorships":[{"author_position":"first","author":{"id":"https://openalex.org/A5033952370","display_name":"Chungha Sung","orcid":null},"institutions":[{"id":"https://openalex.org/I2800817003","display_name":"Southern California University for Professional Studies","ror":"https://ror.org/058zz0t50","country_code":"US","type":"education","lineage":["https://openalex.org/I2800817003"]},{"id":"https://openalex.org/I1174212","display_name":"University of Southern California","ror":"https://ror.org/03taz7m60","country_code":"US","type":"education","lineage":["https://openalex.org/I1174212"]}],"countries":["US"],"is_corresponding":true,"raw_author_name":"Chungha Sung","raw_affiliation_strings":["University of Southern California"],"affiliations":[{"raw_affiliation_string":"University of Southern California","institution_ids":["https://openalex.org/I2800817003","https://openalex.org/I1174212"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5041084431","display_name":"Shuvendu K. Lahiri","orcid":"https://orcid.org/0000-0002-4446-4777"},"institutions":[{"id":"https://openalex.org/I4210105678","display_name":"Microsoft (Finland)","ror":"https://ror.org/01nehjf29","country_code":"FI","type":"company","lineage":["https://openalex.org/I1290206253","https://openalex.org/I4210105678"]}],"countries":["FI"],"is_corresponding":false,"raw_author_name":"Shuvendu K. Lahiri","raw_affiliation_strings":["Microsoft Corporation"],"affiliations":[{"raw_affiliation_string":"Microsoft Corporation","institution_ids":["https://openalex.org/I4210105678"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5062176205","display_name":"Mike Kaufman","orcid":null},"institutions":[{"id":"https://openalex.org/I4210105678","display_name":"Microsoft (Finland)","ror":"https://ror.org/01nehjf29","country_code":"FI","type":"company","lineage":["https://openalex.org/I1290206253","https://openalex.org/I4210105678"]}],"countries":["FI"],"is_corresponding":false,"raw_author_name":"Mike Kaufman","raw_affiliation_strings":["Microsoft Corporation"],"affiliations":[{"raw_affiliation_string":"Microsoft Corporation","institution_ids":["https://openalex.org/I4210105678"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5007319630","display_name":"Pallavi Choudhury","orcid":null},"institutions":[{"id":"https://openalex.org/I4210105678","display_name":"Microsoft (Finland)","ror":"https://ror.org/01nehjf29","country_code":"FI","type":"company","lineage":["https://openalex.org/I1290206253","https://openalex.org/I4210105678"]}],"countries":["FI"],"is_corresponding":false,"raw_author_name":"Pallavi Choudhury","raw_affiliation_strings":["Microsoft Corporation"],"affiliations":[{"raw_affiliation_string":"Microsoft Corporation","institution_ids":["https://openalex.org/I4210105678"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5080656231","display_name":"Jessica Wolk","orcid":null},"institutions":[{"id":"https://openalex.org/I4210105678","display_name":"Microsoft (Finland)","ror":"https://ror.org/01nehjf29","country_code":"FI","type":"company","lineage":["https://openalex.org/I1290206253","https://openalex.org/I4210105678"]}],"countries":["FI"],"is_corresponding":false,"raw_author_name":"Jessica Wolk","raw_affiliation_strings":["Microsoft Corporation"],"affiliations":[{"raw_affiliation_string":"Microsoft Corporation","institution_ids":["https://openalex.org/I4210105678"]}]},{"author_position":"last","author":{"id":"https://openalex.org/A5100407035","display_name":"Chao Wang","orcid":"https://orcid.org/0000-0002-7427-793X"},"institutions":[{"id":"https://openalex.org/I1174212","display_name":"University of Southern California","ror":"https://ror.org/03taz7m60","country_code":"US","type":"education","lineage":["https://openalex.org/I1174212"]},{"id":"https://openalex.org/I2800817003","display_name":"Southern California University for Professional Studies","ror":"https://ror.org/058zz0t50","country_code":"US","type":"education","lineage":["https://openalex.org/I2800817003"]}],"countries":["US"],"is_corresponding":false,"raw_author_name":"Chao Wang","raw_affiliation_strings":["University of Southern California"],"affiliations":[{"raw_affiliation_string":"University of Southern California","institution_ids":["https://openalex.org/I2800817003","https://openalex.org/I1174212"]}]}],"institutions":[],"countries_distinct_count":2,"institutions_distinct_count":6,"corresponding_author_ids":["https://openalex.org/A5033952370"],"corresponding_institution_ids":["https://openalex.org/I1174212","https://openalex.org/I2800817003"],"apc_list":null,"apc_paid":null,"fwci":0.8007,"has_fulltext":false,"cited_by_count":5,"citation_normalized_percentile":{"value":0.7907229,"is_in_top_1_percent":false,"is_in_top_10_percent":false},"cited_by_percentile_year":{"min":95,"max":97},"biblio":{"volume":null,"issue":null,"first_page":"320","last_page":"321"},"is_retracted":false,"is_paratext":false,"is_xpac":false,"primary_topic":{"id":"https://openalex.org/T10260","display_name":"Software Engineering Research","score":0.9998999834060669,"subfield":{"id":"https://openalex.org/subfields/1710","display_name":"Information Systems"},"field":{"id":"https://openalex.org/fields/17","display_name":"Computer Science"},"domain":{"id":"https://openalex.org/domains/3","display_name":"Physical Sciences"}},"topics":[{"id":"https://openalex.org/T10260","display_name":"Software Engineering Research","score":0.9998999834060669,"subfield":{"id":"https://openalex.org/subfields/1710","display_name":"Information Systems"},"field":{"id":"https://openalex.org/fields/17","display_name":"Computer Science"},"domain":{"id":"https://openalex.org/domains/3","display_name":"Physical Sciences"}},{"id":"https://openalex.org/T10743","display_name":"Software Testing and Debugging Techniques","score":0.9973999857902527,"subfield":{"id":"https://openalex.org/subfields/1712","display_name":"Software"},"field":{"id":"https://openalex.org/fields/17","display_name":"Computer Science"},"domain":{"id":"https://openalex.org/domains/3","display_name":"Physical Sciences"}},{"id":"https://openalex.org/T10639","display_name":"Advanced Software Engineering Methodologies","score":0.9948999881744385,"subfield":{"id":"https://openalex.org/subfields/1702","display_name":"Artificial Intelligence"},"field":{"id":"https://openalex.org/fields/17","display_name":"Computer Science"},"domain":{"id":"https://openalex.org/domains/3","display_name":"Physical Sciences"}}],"keywords":[{"id":"https://openalex.org/keywords/merge","display_name":"Merge (version control)","score":0.8098928928375244},{"id":"https://openalex.org/keywords/computer-science","display_name":"Computer science","score":0.6586787104606628},{"id":"https://openalex.org/keywords/data-science","display_name":"Data science","score":0.34737342596054077},{"id":"https://openalex.org/keywords/software-engineering","display_name":"Software engineering","score":0.3458682596683502},{"id":"https://openalex.org/keywords/computer-security","display_name":"Computer security","score":0.34013599157333374},{"id":"https://openalex.org/keywords/distributed-computing","display_name":"Distributed computing","score":0.33839496970176697},{"id":"https://openalex.org/keywords/parallel-computing","display_name":"Parallel computing","score":0.12223869562149048}],"concepts":[{"id":"https://openalex.org/C197129107","wikidata":"https://www.wikidata.org/wiki/Q1921621","display_name":"Merge (version control)","level":2,"score":0.8098928928375244},{"id":"https://openalex.org/C41008148","wikidata":"https://www.wikidata.org/wiki/Q21198","display_name":"Computer science","level":0,"score":0.6586787104606628},{"id":"https://openalex.org/C2522767166","wikidata":"https://www.wikidata.org/wiki/Q2374463","display_name":"Data science","level":1,"score":0.34737342596054077},{"id":"https://openalex.org/C115903868","wikidata":"https://www.wikidata.org/wiki/Q80993","display_name":"Software engineering","level":1,"score":0.3458682596683502},{"id":"https://openalex.org/C38652104","wikidata":"https://www.wikidata.org/wiki/Q3510521","display_name":"Computer security","level":1,"score":0.34013599157333374},{"id":"https://openalex.org/C120314980","wikidata":"https://www.wikidata.org/wiki/Q180634","display_name":"Distributed computing","level":1,"score":0.33839496970176697},{"id":"https://openalex.org/C173608175","wikidata":"https://www.wikidata.org/wiki/Q232661","display_name":"Parallel computing","level":1,"score":0.12223869562149048}],"mesh":[],"locations_count":1,"locations":[{"id":"doi:10.1145/3377812.3390800","is_oa":false,"landing_page_url":"https://doi.org/10.1145/3377812.3390800","pdf_url":null,"source":null,"license":null,"license_id":null,"version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"Proceedings of the ACM/IEEE 42nd International Conference on Software Engineering: Companion Proceedings","raw_type":"proceedings-article"}],"best_oa_location":null,"sustainable_development_goals":[{"display_name":"Industry, innovation and infrastructure","id":"https://metadata.un.org/sdg/9","score":0.5799999833106995}],"awards":[],"funders":[],"has_content":{"pdf":false,"grobid_xml":false},"content_urls":null,"referenced_works_count":25,"referenced_works":["https://openalex.org/W2007267771","https://openalex.org/W2022429945","https://openalex.org/W2034269885","https://openalex.org/W2046368237","https://openalex.org/W2057432538","https://openalex.org/W2064625489","https://openalex.org/W2065489029","https://openalex.org/W2097985262","https://openalex.org/W2100310705","https://openalex.org/W2101723202","https://openalex.org/W2103188316","https://openalex.org/W2109452325","https://openalex.org/W2116821290","https://openalex.org/W2121668868","https://openalex.org/W2125981604","https://openalex.org/W2138365299","https://openalex.org/W2154007683","https://openalex.org/W2154221125","https://openalex.org/W2167626029","https://openalex.org/W2579253943","https://openalex.org/W2883252368","https://openalex.org/W2898097209","https://openalex.org/W2954813749","https://openalex.org/W2962809971","https://openalex.org/W3100317261"],"related_works":["https://openalex.org/W4234886518","https://openalex.org/W2389591058","https://openalex.org/W2486541857","https://openalex.org/W2382112581","https://openalex.org/W3124036233","https://openalex.org/W4229787472","https://openalex.org/W2108840191","https://openalex.org/W2759366996","https://openalex.org/W2110679372","https://openalex.org/W2354081742"],"abstract_inverted_index":{"Divergent":[0],"forks":[1,29],"are":[2],"a":[3,20,102,113,129],"common":[4],"practice":[5],"in":[6,30,40,66],"open-source":[7],"software":[8],"development":[9,16,143],"to":[10,90,108,119],"perform":[11],"long-term,":[12],"independent":[13],"and":[14,61,121,132,145],"diverging":[15],"on":[17,135],"top":[18],"of":[19,42,56,69,76,84,99,104,116,138],"popular":[21],"source":[22,35],"repository.":[23],"However,":[24],"keeping":[25],"such":[26],"divergent":[27],"downstream":[28],"sync":[31],"with":[32],"the":[33,51,62,67,82,97],"upstream":[34,60],"evolution":[36],"poses":[37],"engineering":[38],"challenges":[39],"terms":[41],"frequent":[43,57],"merge":[44,64,85,105],"conflicts.":[45],"In":[46],"this":[47,124],"work,":[48],"we":[49,80,95,126],"conduct":[50],"first":[52],"industrial":[53],"case":[54],"study":[55,74],"merges":[58,91],"from":[59,92],"resulting":[63],"conflicts,":[65],"context":[68],"Microsoft":[70,140],"Edge":[71,141],"development.":[72],"The":[73],"consists":[75],"two":[77],"parts.":[78],"First,":[79],"describe":[81],"nature":[83],"conflicts":[86,106],"that":[87,111],"arise":[88],"due":[89],"upstream.":[93],"Second,":[94],"investigate":[96],"feasibility":[98],"automatically":[100],"fixing":[101],"class":[103],"related":[107],"build":[109],"breaks":[110],"consume":[112],"significant":[114],"amount":[115],"developer":[117],"time":[118],"root-cause":[120],"fix.":[122],"Towards":[123],"end,":[125],"have":[127],"implemented":[128],"tool":[130],"MrgBldBrkFixer":[131],"evaluate":[133],"it":[134],"three":[136],"months":[137],"real":[139],"Beta":[142],"data,":[144],"report":[146],"encouraging":[147],"results.":[148]},"counts_by_year":[{"year":2025,"cited_by_count":2},{"year":2021,"cited_by_count":3}],"updated_date":"2025-11-06T03:46:38.306776","created_date":"2025-10-10T00:00:00"}