{"id":"https://openalex.org/W4233909901","doi":"https://doi.org/10.1145/3377813.3381362","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/W4233909901","doi":"https://doi.org/10.1145/3377813.3381362"},"language":"en","primary_location":{"id":"doi:10.1145/3377813.3381362","is_oa":false,"landing_page_url":"https://doi.org/10.1145/3377813.3381362","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: Software Engineering in Practice","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/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":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":"last","author":{"id":"https://openalex.org/A5100407063","display_name":"Chao Wang","orcid":"https://orcid.org/0009-0000-5147-3295"},"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":5,"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":2.4021,"has_fulltext":false,"cited_by_count":11,"citation_normalized_percentile":{"value":0.91704645,"is_in_top_1_percent":false,"is_in_top_10_percent":true},"cited_by_percentile_year":{"min":95,"max":98},"biblio":{"volume":null,"issue":null,"first_page":"172","last_page":"181"},"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.9997000098228455,"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/T12423","display_name":"Software Reliability and Analysis Research","score":0.9984999895095825,"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"}}],"keywords":[{"id":"https://openalex.org/keywords/merge","display_name":"Merge (version control)","score":0.8004547953605652},{"id":"https://openalex.org/keywords/computer-science","display_name":"Computer science","score":0.6526025533676147},{"id":"https://openalex.org/keywords/open-source-software","display_name":"Open source software","score":0.41182243824005127},{"id":"https://openalex.org/keywords/software","display_name":"Software","score":0.39362263679504395},{"id":"https://openalex.org/keywords/data-science","display_name":"Data science","score":0.35680443048477173},{"id":"https://openalex.org/keywords/software-engineering","display_name":"Software engineering","score":0.34517812728881836},{"id":"https://openalex.org/keywords/computer-security","display_name":"Computer security","score":0.33182835578918457},{"id":"https://openalex.org/keywords/operating-system","display_name":"Operating system","score":0.17773377895355225},{"id":"https://openalex.org/keywords/information-retrieval","display_name":"Information retrieval","score":0.10633480548858643}],"concepts":[{"id":"https://openalex.org/C197129107","wikidata":"https://www.wikidata.org/wiki/Q1921621","display_name":"Merge (version control)","level":2,"score":0.8004547953605652},{"id":"https://openalex.org/C41008148","wikidata":"https://www.wikidata.org/wiki/Q21198","display_name":"Computer science","level":0,"score":0.6526025533676147},{"id":"https://openalex.org/C2988343187","wikidata":"https://www.wikidata.org/wiki/Q1130645","display_name":"Open source software","level":3,"score":0.41182243824005127},{"id":"https://openalex.org/C2777904410","wikidata":"https://www.wikidata.org/wiki/Q7397","display_name":"Software","level":2,"score":0.39362263679504395},{"id":"https://openalex.org/C2522767166","wikidata":"https://www.wikidata.org/wiki/Q2374463","display_name":"Data science","level":1,"score":0.35680443048477173},{"id":"https://openalex.org/C115903868","wikidata":"https://www.wikidata.org/wiki/Q80993","display_name":"Software engineering","level":1,"score":0.34517812728881836},{"id":"https://openalex.org/C38652104","wikidata":"https://www.wikidata.org/wiki/Q3510521","display_name":"Computer security","level":1,"score":0.33182835578918457},{"id":"https://openalex.org/C111919701","wikidata":"https://www.wikidata.org/wiki/Q9135","display_name":"Operating system","level":1,"score":0.17773377895355225},{"id":"https://openalex.org/C23123220","wikidata":"https://www.wikidata.org/wiki/Q816826","display_name":"Information retrieval","level":1,"score":0.10633480548858643}],"mesh":[],"locations_count":1,"locations":[{"id":"doi:10.1145/3377813.3381362","is_oa":false,"landing_page_url":"https://doi.org/10.1145/3377813.3381362","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: Software Engineering in Practice","raw_type":"proceedings-article"}],"best_oa_location":null,"sustainable_development_goals":[{"score":0.5600000023841858,"id":"https://metadata.un.org/sdg/9","display_name":"Industry, innovation and infrastructure"}],"awards":[],"funders":[],"has_content":{"grobid_xml":false,"pdf":false},"content_urls":null,"referenced_works_count":12,"referenced_works":["https://openalex.org/W2034269885","https://openalex.org/W2046368237","https://openalex.org/W2057432538","https://openalex.org/W2064625489","https://openalex.org/W2100310705","https://openalex.org/W2109452325","https://openalex.org/W2121668868","https://openalex.org/W2154007683","https://openalex.org/W2993781365","https://openalex.org/W4241078940","https://openalex.org/W4255973387","https://openalex.org/W6675245795"],"related_works":["https://openalex.org/W4234886518","https://openalex.org/W2389591058","https://openalex.org/W2382112581","https://openalex.org/W3124036233","https://openalex.org/W4229787472","https://openalex.org/W2486541857","https://openalex.org/W2108840191","https://openalex.org/W2759366996","https://openalex.org/W3043142516","https://openalex.org/W2146142316"],"abstract_inverted_index":{"Divergent":[0],"forks":[1,29],"are":[2],"a":[3,20,116,127,143],"common":[4],"practice":[5],"in":[6,30,40,69],"open-source":[7],"software":[8],"development":[9,16,157],"to":[10,93,122,133],"perform":[11],"long-term,":[12],"independent":[13],"and":[14,64,97,105,135,146,159],"diverging":[15],"on":[17,149],"top":[18],"of":[19,42,56,59,72,79,87,113,118,130,152],"popular":[21],"source":[22,35],"repository.":[23],"However,":[24],"keeping":[25],"such":[26],"divergent":[27],"downstream":[28],"sync":[31],"with":[32],"the":[33,51,57,65,70,85,111],"upstream":[34,63,96],"evolution":[36],"poses":[37],"engineering":[38],"challenges":[39],"terms":[41],"frequent":[43,60],"merge":[44,67,88,119],"conflicts.":[45],"In":[46],"this":[47,138],"paper,":[48],"we":[49,83,109,140],"conduct":[50],"first":[52],"industrial":[53],"case":[54],"study":[55,77],"implications":[58],"merges":[61,94],"from":[62,95],"resulting":[66],"conflicts,":[68,102],"context":[71],"Microsoft":[73,154],"Edge":[74,155],"development.":[75],"The":[76],"consists":[78],"two":[80],"parts.":[81],"First,":[82],"describe":[84],"nature":[86],"conflicts":[89,120],"that":[90,125],"arise":[91],"due":[92],"classify":[98],"them":[99],"into":[100],"textual":[101],"build":[103,123],"breaks,":[104],"test":[106],"failures.":[107],"Second,":[108],"investigate":[110],"feasibility":[112],"automatically":[114],"fixing":[115],"class":[117],"related":[121],"breaks":[124],"consume":[126],"significant":[128],"amount":[129],"developer":[131],"time":[132],"root-cause":[134],"fix.":[136],"Towards":[137],"end,":[139],"have":[141],"implemented":[142],"tool":[144],"MrgBldBrkFixer":[145],"evaluate":[147],"it":[148],"three":[150],"months":[151],"real":[153],"Beta":[156],"data,":[158],"report":[160],"encouraging":[161],"results.":[162]},"counts_by_year":[{"year":2025,"cited_by_count":2},{"year":2023,"cited_by_count":4},{"year":2022,"cited_by_count":5}],"updated_date":"2025-11-06T03:46:38.306776","created_date":"2025-10-10T00:00:00"}