{"id":"https://openalex.org/W4399668119","doi":"https://doi.org/10.1145/3661167.3661197","title":"Towards Semi-Automated Merge Conflict Resolution: Is It Easier Than We Expected?","display_name":"Towards Semi-Automated Merge Conflict Resolution: Is It Easier Than We Expected?","publication_year":2024,"publication_date":"2024-06-14","ids":{"openalex":"https://openalex.org/W4399668119","doi":"https://doi.org/10.1145/3661167.3661197"},"language":"en","primary_location":{"id":"doi:10.1145/3661167.3661197","is_oa":false,"landing_page_url":"https://doi.org/10.1145/3661167.3661197","pdf_url":null,"source":null,"license":null,"license_id":null,"version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"Proceedings of the 28th International Conference on Evaluation and Assessment in Software Engineering","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/A5027356489","display_name":"Alexander Boll","orcid":"https://orcid.org/0000-0002-9881-9748"},"institutions":[{"id":"https://openalex.org/I118564535","display_name":"University of Bern","ror":"https://ror.org/02k7v4d05","country_code":"CH","type":"education","lineage":["https://openalex.org/I118564535"]}],"countries":["CH"],"is_corresponding":true,"raw_author_name":"Alexander Boll","raw_affiliation_strings":["University of Bern, Switzerland"],"affiliations":[{"raw_affiliation_string":"University of Bern, Switzerland","institution_ids":["https://openalex.org/I118564535"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5099127826","display_name":"Yael Van Dok","orcid":"https://orcid.org/0009-0006-0084-7414"},"institutions":[{"id":"https://openalex.org/I118564535","display_name":"University of Bern","ror":"https://ror.org/02k7v4d05","country_code":"CH","type":"education","lineage":["https://openalex.org/I118564535"]}],"countries":["CH"],"is_corresponding":false,"raw_author_name":"Yael Van Dok","raw_affiliation_strings":["University of Bern, Switzerland"],"affiliations":[{"raw_affiliation_string":"University of Bern, Switzerland","institution_ids":["https://openalex.org/I118564535"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5019968177","display_name":"Manuel Ohrndorf","orcid":"https://orcid.org/0009-0002-2135-1136"},"institutions":[{"id":"https://openalex.org/I118564535","display_name":"University of Bern","ror":"https://ror.org/02k7v4d05","country_code":"CH","type":"education","lineage":["https://openalex.org/I118564535"]}],"countries":["CH"],"is_corresponding":false,"raw_author_name":"Manuel Ohrndorf","raw_affiliation_strings":["University of Bern, Switzerland"],"affiliations":[{"raw_affiliation_string":"University of Bern, Switzerland","institution_ids":["https://openalex.org/I118564535"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5062702732","display_name":"Alexander Schulthei\u00df","orcid":"https://orcid.org/0000-0002-1509-1449"},"institutions":[{"id":"https://openalex.org/I206945453","display_name":"Paderborn University","ror":"https://ror.org/058kzsd48","country_code":"DE","type":"education","lineage":["https://openalex.org/I206945453"]}],"countries":["DE"],"is_corresponding":false,"raw_author_name":"Alexander Schulthei\u00df","raw_affiliation_strings":["Paderborn University, Germany"],"affiliations":[{"raw_affiliation_string":"Paderborn University, Germany","institution_ids":["https://openalex.org/I206945453"]}]},{"author_position":"last","author":{"id":"https://openalex.org/A5078065547","display_name":"Timo Kehrer","orcid":"https://orcid.org/0000-0002-2582-5557"},"institutions":[{"id":"https://openalex.org/I118564535","display_name":"University of Bern","ror":"https://ror.org/02k7v4d05","country_code":"CH","type":"education","lineage":["https://openalex.org/I118564535"]}],"countries":["CH"],"is_corresponding":false,"raw_author_name":"Timo Kehrer","raw_affiliation_strings":["University of Bern, Switzerland"],"affiliations":[{"raw_affiliation_string":"University of Bern, Switzerland","institution_ids":["https://openalex.org/I118564535"]}]}],"institutions":[],"countries_distinct_count":2,"institutions_distinct_count":5,"corresponding_author_ids":["https://openalex.org/A5027356489"],"corresponding_institution_ids":["https://openalex.org/I118564535"],"apc_list":null,"apc_paid":null,"fwci":0.3795,"has_fulltext":false,"cited_by_count":1,"citation_normalized_percentile":{"value":0.60755666,"is_in_top_1_percent":false,"is_in_top_10_percent":false},"cited_by_percentile_year":{"min":91,"max":95},"biblio":{"volume":null,"issue":null,"first_page":"282","last_page":"292"},"is_retracted":false,"is_paratext":false,"is_xpac":false,"primary_topic":{"id":"https://openalex.org/T10142","display_name":"Formal Methods in Verification","score":0.9815999865531921,"subfield":{"id":"https://openalex.org/subfields/1703","display_name":"Computational Theory and Mathematics"},"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/T10142","display_name":"Formal Methods in Verification","score":0.9815999865531921,"subfield":{"id":"https://openalex.org/subfields/1703","display_name":"Computational Theory and Mathematics"},"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/T10703","display_name":"Business Process Modeling and Analysis","score":0.980400025844574,"subfield":{"id":"https://openalex.org/subfields/1404","display_name":"Management Information Systems"},"field":{"id":"https://openalex.org/fields/14","display_name":"Business, Management and Accounting"},"domain":{"id":"https://openalex.org/domains/2","display_name":"Social Sciences"}},{"id":"https://openalex.org/T11450","display_name":"Model-Driven Software Engineering Techniques","score":0.9459999799728394,"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.7682378888130188},{"id":"https://openalex.org/keywords/computer-science","display_name":"Computer science","score":0.6638789772987366},{"id":"https://openalex.org/keywords/conflict-resolution","display_name":"Conflict resolution","score":0.47146230936050415},{"id":"https://openalex.org/keywords/information-retrieval","display_name":"Information retrieval","score":0.1331949532032013},{"id":"https://openalex.org/keywords/political-science","display_name":"Political science","score":0.0663733184337616}],"concepts":[{"id":"https://openalex.org/C197129107","wikidata":"https://www.wikidata.org/wiki/Q1921621","display_name":"Merge (version control)","level":2,"score":0.7682378888130188},{"id":"https://openalex.org/C41008148","wikidata":"https://www.wikidata.org/wiki/Q21198","display_name":"Computer science","level":0,"score":0.6638789772987366},{"id":"https://openalex.org/C21711469","wikidata":"https://www.wikidata.org/wiki/Q1194317","display_name":"Conflict resolution","level":2,"score":0.47146230936050415},{"id":"https://openalex.org/C23123220","wikidata":"https://www.wikidata.org/wiki/Q816826","display_name":"Information retrieval","level":1,"score":0.1331949532032013},{"id":"https://openalex.org/C17744445","wikidata":"https://www.wikidata.org/wiki/Q36442","display_name":"Political science","level":0,"score":0.0663733184337616},{"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/3661167.3661197","is_oa":false,"landing_page_url":"https://doi.org/10.1145/3661167.3661197","pdf_url":null,"source":null,"license":null,"license_id":null,"version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"Proceedings of the 28th International Conference on Evaluation and Assessment in Software Engineering","raw_type":"proceedings-article"}],"best_oa_location":null,"sustainable_development_goals":[],"awards":[],"funders":[],"has_content":{"grobid_xml":false,"pdf":false},"content_urls":null,"referenced_works_count":23,"referenced_works":["https://openalex.org/W98718822","https://openalex.org/W1989498066","https://openalex.org/W1996993752","https://openalex.org/W2001907377","https://openalex.org/W2038013574","https://openalex.org/W2089247684","https://openalex.org/W2091147687","https://openalex.org/W2097985262","https://openalex.org/W2121668868","https://openalex.org/W2125981604","https://openalex.org/W2128939574","https://openalex.org/W2767491836","https://openalex.org/W2804507477","https://openalex.org/W2912237649","https://openalex.org/W2956004331","https://openalex.org/W3000085978","https://openalex.org/W3161853930","https://openalex.org/W3162620983","https://openalex.org/W3210965569","https://openalex.org/W4206143487","https://openalex.org/W4296938538","https://openalex.org/W6606991017","https://openalex.org/W6672930239"],"related_works":["https://openalex.org/W4391375266","https://openalex.org/W2748952813","https://openalex.org/W4234886518","https://openalex.org/W2389591058","https://openalex.org/W2390279801","https://openalex.org/W2382112581","https://openalex.org/W3124036233","https://openalex.org/W4229787472","https://openalex.org/W2358668433","https://openalex.org/W4396701345"],"abstract_inverted_index":{"In":[0,65],"version":[1],"control":[2],"systems":[3],"such":[4],"as":[5,136],"Git,":[6],"concurrent":[7],"modifications":[8],"on":[9,29,33,49,102,107,208],"the":[10,20,72,103,112,159,186,203,218],"same":[11],"artifacts":[12],"can":[13],"cause":[14],"merge":[15,83,114,210,214,227],"conflicts":[16],"that":[17,36,149],"may":[18],"disrupt":[19],"development":[21],"workflow":[22],"by":[23,80,141],"requiring":[24],"manual":[25],"intervention.":[26],"While":[27],"research":[28],"software":[30],"merging":[31],"focused":[32],"sophisticated":[34,209],"techniques":[35,211],"hardly":[37],"had":[38],"any":[39],"impact":[40],"in":[41],"practice,":[42],"we":[43,70,147,175,184,199],"present":[44],"an":[45],"empirical":[46],"feasibility":[47],"study":[48],"semi-automated":[50,169],"conflict":[51,62,77,84,170,193,215],"resolution":[52,63,78,97,171],"using":[53],"a":[54,59,66,87,137],"fixed":[55],"set":[56],"of":[57,74,86,90,105,110,125,132,189],"only":[58],"few":[60],"language-agnostic":[61],"patterns.":[64,98],"large-scale":[67],"quantitative":[68],"analysis,":[69,198],"simulate":[71],"performance":[73],"our":[75,196],"hypothetical":[76],"strategy":[79],"classifying":[81],"131,154":[82],"resolutions":[85],"diverse":[88],"sample":[89],"10,000":[91],"GitHub":[92],"projects":[93],"according":[94],"to":[95,167,201],"these":[96],"We":[99],"shed":[100],"light":[101],"derivability":[104],"merges":[106,133],"multiple":[108],"levels":[109],"granularity:":[111],"conflicting":[113,117,122],"commit,":[115],"its":[116],"files":[118,156],"and":[119,212,223],"their":[120],"individual":[121,155],"chunks.":[123],"87.9%":[124],"chunks":[126],"are":[127,134,151],"derivable":[128,135],"individually,":[129],"while":[130],"34.5%":[131],"whole.":[138],"Interestingly,":[139],"however,":[140],"inspecting":[142],"potential":[143],"factors":[144],"affecting":[145],"derivability,":[146],"observe":[148],"there":[150],"stronger":[152],"correlations":[153],"considering":[154,158],"than":[157,174],"entire":[160],"merge.":[161],"A":[162],"short":[163],"yet":[164],"preliminary":[165],"answer":[166],"whether":[168],"is":[172],"easier":[173],"expected":[176],"is:":[177],"yes,":[178],"it":[179],"might":[180],"be,":[181],"particularly":[182],"if":[183],"use":[185],"right":[187],"level":[188],"granularity":[190],"for":[191,220],"proposing":[192],"resolutions.":[194],"Through":[195],"comprehensive":[197],"aspire":[200],"bridge":[202],"gap":[204],"between":[205],"academic":[206],"innovations":[207],"real-world":[213],"scenarios,":[216],"laying":[217],"groundwork":[219],"more":[221],"effective":[222],"widely":[224],"accepted":[225],"automatic":[226],"tools.":[228]},"counts_by_year":[{"year":2025,"cited_by_count":1}],"updated_date":"2025-12-26T23:08:49.675405","created_date":"2025-10-10T00:00:00"}