{"id":"https://openalex.org/W6925292344","doi":"https://doi.org/10.18420/se2025-20","title":"Towards Semi-Automated Merge Conflict Resolution","display_name":"Towards Semi-Automated Merge Conflict Resolution","publication_year":2025,"publication_date":"2025-01-01","ids":{"openalex":"https://openalex.org/W6925292344","doi":"https://doi.org/10.18420/se2025-20"},"language":"en","primary_location":{"id":"doi:10.18420/se2025-20","is_oa":true,"landing_page_url":"https://doi.org/10.18420/se2025-20","pdf_url":null,"source":{"id":"https://openalex.org/S7407052918","display_name":"Gesellschaft f\u00fcr Informatik (GI)","issn_l":null,"issn":[],"is_oa":false,"is_in_doaj":false,"is_core":false,"host_organization":null,"host_organization_name":null,"host_organization_lineage":[],"host_organization_lineage_names":[],"type":"repository"},"license":null,"license_id":null,"version":null,"is_accepted":false,"is_published":false,"raw_source_name":null,"raw_type":"article-journal"},"type":"article","indexed_in":["datacite"],"open_access":{"is_oa":true,"oa_status":"green","oa_url":"https://doi.org/10.18420/se2025-20","any_repository_has_fulltext":true},"authorships":[{"author_position":"first","author":{"id":null,"display_name":"Boll, Alexander","orcid":null},"institutions":[],"countries":[],"is_corresponding":true,"raw_author_name":"Boll, Alexander","raw_affiliation_strings":[],"affiliations":[]},{"author_position":"middle","author":{"id":null,"display_name":"van Dok, Yael","orcid":null},"institutions":[],"countries":[],"is_corresponding":false,"raw_author_name":"van Dok, Yael","raw_affiliation_strings":[],"affiliations":[]},{"author_position":"middle","author":{"id":null,"display_name":"Ohrndorf, Manuel","orcid":null},"institutions":[],"countries":[],"is_corresponding":false,"raw_author_name":"Ohrndorf, Manuel","raw_affiliation_strings":[],"affiliations":[]},{"author_position":"middle","author":{"id":null,"display_name":"Schulthei\u00df, Alexander","orcid":null},"institutions":[],"countries":[],"is_corresponding":false,"raw_author_name":"Schulthei\u00df, Alexander","raw_affiliation_strings":[],"affiliations":[]},{"author_position":"last","author":{"id":null,"display_name":"Kehrer, Timo","orcid":null},"institutions":[],"countries":[],"is_corresponding":false,"raw_author_name":"Kehrer, Timo","raw_affiliation_strings":[],"affiliations":[]}],"institutions":[],"countries_distinct_count":0,"institutions_distinct_count":5,"corresponding_author_ids":[],"corresponding_institution_ids":[],"apc_list":null,"apc_paid":null,"fwci":0.0,"has_fulltext":false,"cited_by_count":0,"citation_normalized_percentile":{"value":0.51785593,"is_in_top_1_percent":false,"is_in_top_10_percent":false},"cited_by_percentile_year":null,"biblio":{"volume":null,"issue":null,"first_page":null,"last_page":null},"is_retracted":false,"is_paratext":false,"is_xpac":true,"primary_topic":{"id":"https://openalex.org/T11539","display_name":"Survey Methodology and Nonresponse","score":0.10509999841451645,"subfield":{"id":"https://openalex.org/subfields/3312","display_name":"Sociology and Political Science"},"field":{"id":"https://openalex.org/fields/33","display_name":"Social Sciences"},"domain":{"id":"https://openalex.org/domains/2","display_name":"Social Sciences"}},"topics":[{"id":"https://openalex.org/T11539","display_name":"Survey Methodology and Nonresponse","score":0.10509999841451645,"subfield":{"id":"https://openalex.org/subfields/3312","display_name":"Sociology and Political Science"},"field":{"id":"https://openalex.org/fields/33","display_name":"Social Sciences"},"domain":{"id":"https://openalex.org/domains/2","display_name":"Social Sciences"}},{"id":"https://openalex.org/T12088","display_name":"Intergenerational and Educational Inequality Studies","score":0.02800000086426735,"subfield":{"id":"https://openalex.org/subfields/3312","display_name":"Sociology and Political Science"},"field":{"id":"https://openalex.org/fields/33","display_name":"Social Sciences"},"domain":{"id":"https://openalex.org/domains/2","display_name":"Social Sciences"}},{"id":"https://openalex.org/T14118","display_name":"Social and Demographic Issues in Germany","score":0.02410000003874302,"subfield":{"id":"https://openalex.org/subfields/3600","display_name":"General Health Professions"},"field":{"id":"https://openalex.org/fields/36","display_name":"Health Professions"},"domain":{"id":"https://openalex.org/domains/4","display_name":"Health Sciences"}}],"keywords":[{"id":"https://openalex.org/keywords/merge","display_name":"Merge (version control)","score":0.8367000222206116},{"id":"https://openalex.org/keywords/conflict-resolution","display_name":"Conflict resolution","score":0.6262999773025513},{"id":"https://openalex.org/keywords/workflow","display_name":"Workflow","score":0.5557000041007996},{"id":"https://openalex.org/keywords/granularity","display_name":"Granularity","score":0.45260000228881836},{"id":"https://openalex.org/keywords/software","display_name":"Software","score":0.375}],"concepts":[{"id":"https://openalex.org/C197129107","wikidata":"https://www.wikidata.org/wiki/Q1921621","display_name":"Merge (version control)","level":2,"score":0.8367000222206116},{"id":"https://openalex.org/C41008148","wikidata":"https://www.wikidata.org/wiki/Q21198","display_name":"Computer science","level":0,"score":0.6747999787330627},{"id":"https://openalex.org/C21711469","wikidata":"https://www.wikidata.org/wiki/Q1194317","display_name":"Conflict resolution","level":2,"score":0.6262999773025513},{"id":"https://openalex.org/C177212765","wikidata":"https://www.wikidata.org/wiki/Q627335","display_name":"Workflow","level":2,"score":0.5557000041007996},{"id":"https://openalex.org/C177774035","wikidata":"https://www.wikidata.org/wiki/Q1246948","display_name":"Granularity","level":2,"score":0.45260000228881836},{"id":"https://openalex.org/C124101348","wikidata":"https://www.wikidata.org/wiki/Q172491","display_name":"Data mining","level":1,"score":0.4002000093460083},{"id":"https://openalex.org/C2777904410","wikidata":"https://www.wikidata.org/wiki/Q7397","display_name":"Software","level":2,"score":0.375},{"id":"https://openalex.org/C2522767166","wikidata":"https://www.wikidata.org/wiki/Q2374463","display_name":"Data science","level":1,"score":0.37290000915527344},{"id":"https://openalex.org/C140086265","wikidata":"https://www.wikidata.org/wiki/Q11341754","display_name":"Merge algorithm","level":4,"score":0.33959999680519104},{"id":"https://openalex.org/C83264182","wikidata":"https://www.wikidata.org/wiki/Q5160206","display_name":"Conflict resolution strategy","level":3,"score":0.32919999957084656},{"id":"https://openalex.org/C154945302","wikidata":"https://www.wikidata.org/wiki/Q11660","display_name":"Artificial intelligence","level":1,"score":0.32260000705718994},{"id":"https://openalex.org/C120936955","wikidata":"https://www.wikidata.org/wiki/Q2155640","display_name":"Empirical research","level":2,"score":0.29440000653266907},{"id":"https://openalex.org/C23123220","wikidata":"https://www.wikidata.org/wiki/Q816826","display_name":"Information retrieval","level":1,"score":0.27880001068115234}],"mesh":[],"locations_count":1,"locations":[{"id":"doi:10.18420/se2025-20","is_oa":true,"landing_page_url":"https://doi.org/10.18420/se2025-20","pdf_url":null,"source":{"id":"https://openalex.org/S7407052918","display_name":"Gesellschaft f\u00fcr Informatik (GI)","issn_l":null,"issn":[],"is_oa":false,"is_in_doaj":false,"is_core":false,"host_organization":null,"host_organization_name":null,"host_organization_lineage":[],"host_organization_lineage_names":[],"type":"repository"},"license":null,"license_id":null,"version":null,"is_accepted":false,"is_published":null,"raw_source_name":null,"raw_type":"article-journal"}],"best_oa_location":{"id":"doi:10.18420/se2025-20","is_oa":true,"landing_page_url":"https://doi.org/10.18420/se2025-20","pdf_url":null,"source":{"id":"https://openalex.org/S7407052918","display_name":"Gesellschaft f\u00fcr Informatik (GI)","issn_l":null,"issn":[],"is_oa":false,"is_in_doaj":false,"is_core":false,"host_organization":null,"host_organization_name":null,"host_organization_lineage":[],"host_organization_lineage_names":[],"type":"repository"},"license":null,"license_id":null,"version":null,"is_accepted":false,"is_published":false,"raw_source_name":null,"raw_type":"article-journal"},"sustainable_development_goals":[],"awards":[],"funders":[],"has_content":{"grobid_xml":false,"pdf":false},"content_urls":null,"referenced_works_count":0,"referenced_works":[],"related_works":[],"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":[],"updated_date":"2025-11-06T06:51:31.235846","created_date":"2025-10-10T00:00:00"}