{"id":"https://openalex.org/W2898225668","doi":"https://doi.org/10.1145/3276536","title":"Conflict resolution for structured merge via version space algebra","display_name":"Conflict resolution for structured merge via version space algebra","publication_year":2018,"publication_date":"2018-10-24","ids":{"openalex":"https://openalex.org/W2898225668","doi":"https://doi.org/10.1145/3276536","mag":"2898225668"},"language":"en","primary_location":{"id":"doi:10.1145/3276536","is_oa":true,"landing_page_url":"https://doi.org/10.1145/3276536","pdf_url":"https://dl.acm.org/doi/pdf/10.1145/3276536","source":{"id":"https://openalex.org/S4210216081","display_name":"Proceedings of the ACM on Programming Languages","issn_l":"2475-1421","issn":["2475-1421"],"is_oa":true,"is_in_doaj":false,"is_core":true,"host_organization":"https://openalex.org/P4310319798","host_organization_name":"Association for Computing Machinery","host_organization_lineage":["https://openalex.org/P4310319798"],"host_organization_lineage_names":["Association for Computing Machinery"],"type":"journal"},"license":"cc-by","license_id":"https://openalex.org/licenses/cc-by","version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"Proceedings of the ACM on Programming Languages","raw_type":"journal-article"},"type":"article","indexed_in":["crossref"],"open_access":{"is_oa":true,"oa_status":"diamond","oa_url":"https://dl.acm.org/doi/pdf/10.1145/3276536","any_repository_has_fulltext":false},"authorships":[{"author_position":"first","author":{"id":"https://openalex.org/A5074246713","display_name":"Fengmin Zhu","orcid":"https://orcid.org/0000-0003-4219-0837"},"institutions":[{"id":"https://openalex.org/I99065089","display_name":"Tsinghua University","ror":"https://ror.org/03cve4549","country_code":"CN","type":"education","lineage":["https://openalex.org/I99065089"]}],"countries":["CN"],"is_corresponding":false,"raw_author_name":"Fengmin Zhu","raw_affiliation_strings":["Tsinghua University, China"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"Tsinghua University, China","institution_ids":["https://openalex.org/I99065089"]}]},{"author_position":"last","author":{"id":"https://openalex.org/A5042735025","display_name":"Fei He","orcid":"https://orcid.org/0000-0002-4266-875X"},"institutions":[{"id":"https://openalex.org/I99065089","display_name":"Tsinghua University","ror":"https://ror.org/03cve4549","country_code":"CN","type":"education","lineage":["https://openalex.org/I99065089"]}],"countries":["CN"],"is_corresponding":false,"raw_author_name":"Fei He","raw_affiliation_strings":["Tsinghua University, China"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"Tsinghua University, China","institution_ids":["https://openalex.org/I99065089"]}]}],"institutions":[],"countries_distinct_count":1,"institutions_distinct_count":1,"corresponding_author_ids":[],"corresponding_institution_ids":["https://openalex.org/I99065089"],"apc_list":null,"apc_paid":null,"fwci":4.8434,"has_fulltext":true,"cited_by_count":37,"citation_normalized_percentile":{"value":0.95767906,"is_in_top_1_percent":false,"is_in_top_10_percent":true},"cited_by_percentile_year":{"min":94,"max":99},"biblio":{"volume":"2","issue":"OOPSLA","first_page":"1","last_page":"25"},"is_retracted":false,"is_paratext":false,"is_xpac":false,"primary_topic":{"id":"https://openalex.org/T10260","display_name":"Software Engineering Research","score":1.0,"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":1.0,"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.9990000128746033,"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/T10126","display_name":"Logic, programming, and type systems","score":0.996399998664856,"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.8819656372070312},{"id":"https://openalex.org/keywords/computer-science","display_name":"Computer science","score":0.7077354192733765},{"id":"https://openalex.org/keywords/conflict-resolution","display_name":"Conflict resolution","score":0.5569966435432434},{"id":"https://openalex.org/keywords/software","display_name":"Software","score":0.4724560081958771},{"id":"https://openalex.org/keywords/theoretical-computer-science","display_name":"Theoretical computer science","score":0.4083670973777771},{"id":"https://openalex.org/keywords/information-retrieval","display_name":"Information retrieval","score":0.38174813985824585},{"id":"https://openalex.org/keywords/programming-language","display_name":"Programming language","score":0.20425045490264893}],"concepts":[{"id":"https://openalex.org/C197129107","wikidata":"https://www.wikidata.org/wiki/Q1921621","display_name":"Merge (version control)","level":2,"score":0.8819656372070312},{"id":"https://openalex.org/C41008148","wikidata":"https://www.wikidata.org/wiki/Q21198","display_name":"Computer science","level":0,"score":0.7077354192733765},{"id":"https://openalex.org/C21711469","wikidata":"https://www.wikidata.org/wiki/Q1194317","display_name":"Conflict resolution","level":2,"score":0.5569966435432434},{"id":"https://openalex.org/C2777904410","wikidata":"https://www.wikidata.org/wiki/Q7397","display_name":"Software","level":2,"score":0.4724560081958771},{"id":"https://openalex.org/C80444323","wikidata":"https://www.wikidata.org/wiki/Q2878974","display_name":"Theoretical computer science","level":1,"score":0.4083670973777771},{"id":"https://openalex.org/C23123220","wikidata":"https://www.wikidata.org/wiki/Q816826","display_name":"Information retrieval","level":1,"score":0.38174813985824585},{"id":"https://openalex.org/C199360897","wikidata":"https://www.wikidata.org/wiki/Q9143","display_name":"Programming language","level":1,"score":0.20425045490264893},{"id":"https://openalex.org/C17744445","wikidata":"https://www.wikidata.org/wiki/Q36442","display_name":"Political science","level":0,"score":0.0},{"id":"https://openalex.org/C199539241","wikidata":"https://www.wikidata.org/wiki/Q7748","display_name":"Law","level":1,"score":0.0}],"mesh":[],"locations_count":1,"locations":[{"id":"doi:10.1145/3276536","is_oa":true,"landing_page_url":"https://doi.org/10.1145/3276536","pdf_url":"https://dl.acm.org/doi/pdf/10.1145/3276536","source":{"id":"https://openalex.org/S4210216081","display_name":"Proceedings of the ACM on Programming Languages","issn_l":"2475-1421","issn":["2475-1421"],"is_oa":true,"is_in_doaj":false,"is_core":true,"host_organization":"https://openalex.org/P4310319798","host_organization_name":"Association for Computing Machinery","host_organization_lineage":["https://openalex.org/P4310319798"],"host_organization_lineage_names":["Association for Computing Machinery"],"type":"journal"},"license":"cc-by","license_id":"https://openalex.org/licenses/cc-by","version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"Proceedings of the ACM on Programming Languages","raw_type":"journal-article"}],"best_oa_location":{"id":"doi:10.1145/3276536","is_oa":true,"landing_page_url":"https://doi.org/10.1145/3276536","pdf_url":"https://dl.acm.org/doi/pdf/10.1145/3276536","source":{"id":"https://openalex.org/S4210216081","display_name":"Proceedings of the ACM on Programming Languages","issn_l":"2475-1421","issn":["2475-1421"],"is_oa":true,"is_in_doaj":false,"is_core":true,"host_organization":"https://openalex.org/P4310319798","host_organization_name":"Association for Computing Machinery","host_organization_lineage":["https://openalex.org/P4310319798"],"host_organization_lineage_names":["Association for Computing Machinery"],"type":"journal"},"license":"cc-by","license_id":"https://openalex.org/licenses/cc-by","version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"Proceedings of the ACM on Programming Languages","raw_type":"journal-article"},"sustainable_development_goals":[],"awards":[{"id":"https://openalex.org/G2728061125","display_name":null,"funder_award_id":"Grant No. 61672310 and Grant No. 61527812","funder_id":"https://openalex.org/F4320335595","funder_display_name":"National Natural Science Foundation of China-Yunnan Joint Fund"},{"id":"https://openalex.org/G3740624217","display_name":null,"funder_award_id":"61527812","funder_id":"https://openalex.org/F4320321001","funder_display_name":"National Natural Science Foundation of China"},{"id":"https://openalex.org/G4861134968","display_name":null,"funder_award_id":"2016ZX01038101","funder_id":"https://openalex.org/F4320329860","funder_display_name":"National Science and Technology Major Project"},{"id":"https://openalex.org/G6040694725","display_name":"\u9762\u5411\u8f6f\u4ef6\u6f14\u5316\u7684\u56de\u5f52\u5f62\u5f0f\u5316\u9a8c\u8bc1\u7814\u7a76","funder_award_id":"61672310","funder_id":"https://openalex.org/F4320321001","funder_display_name":"National Natural Science Foundation of China"},{"id":"https://openalex.org/G8531561333","display_name":null,"funder_award_id":"2016ZX01038101","funder_id":"https://openalex.org/F4320321001","funder_display_name":"National Natural Science Foundation of China"}],"funders":[{"id":"https://openalex.org/F4320321001","display_name":"National Natural Science Foundation of China","ror":"https://ror.org/01h0zpd94"},{"id":"https://openalex.org/F4320329860","display_name":"National Science and Technology Major Project","ror":null},{"id":"https://openalex.org/F4320335595","display_name":"National Natural Science Foundation of China-Yunnan Joint Fund","ror":null}],"has_content":{"pdf":true,"grobid_xml":true},"content_urls":{"pdf":"https://content.openalex.org/works/W2898225668.pdf","grobid_xml":"https://content.openalex.org/works/W2898225668.grobid-xml"},"referenced_works_count":39,"referenced_works":["https://openalex.org/W1555563117","https://openalex.org/W1561445823","https://openalex.org/W1976019354","https://openalex.org/W1986466161","https://openalex.org/W1988281920","https://openalex.org/W2007267771","https://openalex.org/W2009207944","https://openalex.org/W2011975945","https://openalex.org/W2012312630","https://openalex.org/W2020874073","https://openalex.org/W2030408041","https://openalex.org/W2046368237","https://openalex.org/W2049311030","https://openalex.org/W2060333670","https://openalex.org/W2060610732","https://openalex.org/W2093535699","https://openalex.org/W2113371678","https://openalex.org/W2121668868","https://openalex.org/W2124315882","https://openalex.org/W2125981604","https://openalex.org/W2127811329","https://openalex.org/W2132525863","https://openalex.org/W2144951274","https://openalex.org/W2148576927","https://openalex.org/W2161052636","https://openalex.org/W2161835696","https://openalex.org/W2288434693","https://openalex.org/W2293413777","https://openalex.org/W2294286398","https://openalex.org/W2309755354","https://openalex.org/W2416325154","https://openalex.org/W2515936044","https://openalex.org/W2537005436","https://openalex.org/W2761459579","https://openalex.org/W2767491836","https://openalex.org/W2962809971","https://openalex.org/W4237412827","https://openalex.org/W4255108598","https://openalex.org/W4302978359"],"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/W2108840191","https://openalex.org/W2759366996","https://openalex.org/W2354081742","https://openalex.org/W2372661603","https://openalex.org/W1785572788"],"abstract_inverted_index":{"Resolving":[0],"conflicts":[1,115],"is":[2,23,43,92],"the":[3,16,37,44,55,84,89,97],"main":[4],"challenge":[5],"for":[6,32,47,80],"software":[7],"merging.":[8],"The":[9],"existing":[10],"merge":[11,34,106],"tools":[12],"usually":[13],"rely":[14],"on":[15,112],"developer":[17],"to":[18,95],"manually":[19],"resolve":[20],"conflicts.":[21,35],"This":[22],"of":[24,39,50,60,125],"course":[25],"inefficient.":[26],"We":[27,74,100],"propose":[28,64],"an":[29,65],"interactive":[30],"approach":[31,103],"resolving":[33],"To":[36,53],"best":[38],"our":[40,102,126],"knowledge,":[41],"this":[42],"first":[45],"attempt":[46],"conflict":[48],"resolution":[49,91],"structured":[51],"merge.":[52],"represent":[54],"possibly":[56],"very":[57,93],"large":[58],"set":[59],"candidate":[61],"programs,":[62],"we":[63],"expressive":[66],"and":[67,109],"efficient":[68],"representation":[69],"by":[70],"version":[71],"space":[72],"algebra.":[73],"also":[75],"design":[76],"a":[77,105],"simple":[78],"mechanism":[79],"ranking":[81],"resolutions":[82],"in":[83],"program":[85],"space,":[86],"such":[87],"that":[88],"top-ranked":[90],"likely":[94],"meet":[96],"developer's":[98],"expectation.":[99],"prototype":[101],"as":[104],"tool":[107],"AutoMerge,":[108],"evaluate":[110],"it":[111],"244":[113],"real-world":[114],"arising":[116],"from":[117],"10":[118],"open-source":[119],"projects.":[120],"Results":[121],"show":[122],"great":[123],"practicality":[124],"approach.":[127]},"counts_by_year":[{"year":2026,"cited_by_count":1},{"year":2025,"cited_by_count":5},{"year":2024,"cited_by_count":7},{"year":2023,"cited_by_count":5},{"year":2022,"cited_by_count":9},{"year":2021,"cited_by_count":4},{"year":2020,"cited_by_count":4},{"year":2019,"cited_by_count":2}],"updated_date":"2026-07-30T17:31:21.811387","created_date":"2025-10-10T00:00:00"}