{"id":"https://openalex.org/W4206814005","doi":"https://doi.org/10.1109/ase51524.2021.9678937","title":"SoManyConflicts: Resolve Many Merge Conflicts Interactively and Systematically","display_name":"SoManyConflicts: Resolve Many Merge Conflicts Interactively and Systematically","publication_year":2021,"publication_date":"2021-11-01","ids":{"openalex":"https://openalex.org/W4206814005","doi":"https://doi.org/10.1109/ase51524.2021.9678937"},"language":"en","primary_location":{"id":"doi:10.1109/ase51524.2021.9678937","is_oa":false,"landing_page_url":"https://doi.org/10.1109/ase51524.2021.9678937","pdf_url":null,"source":{"id":"https://openalex.org/S4363608212","display_name":"2021 36th IEEE/ACM International Conference on Automated Software Engineering (ASE)","issn_l":null,"issn":null,"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":"conference"},"license":null,"license_id":null,"version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"2021 36th IEEE/ACM International Conference on Automated Software Engineering (ASE)","raw_type":"proceedings-article"},"type":"conference-paper","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/A5101791082","display_name":"Bo Shen","orcid":"https://orcid.org/0000-0002-0825-8001"},"institutions":[{"id":"https://openalex.org/I20231570","display_name":"Peking University","ror":"https://ror.org/02v51f717","country_code":"CN","type":"education","lineage":["https://openalex.org/I20231570"]}],"countries":["CN"],"is_corresponding":false,"raw_author_name":"Bo Shen","raw_affiliation_strings":["EECS, Peking University, Beijing, China","Key Laboratory of High Confidence Software Technologies (Peking University), MoE, China"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"EECS, Peking University, Beijing, China","institution_ids":["https://openalex.org/I20231570"]},{"raw_affiliation_string":"Key Laboratory of High Confidence Software Technologies (Peking University), MoE, China","institution_ids":["https://openalex.org/I20231570"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5100441683","display_name":"Wei Zhang","orcid":"https://orcid.org/0000-0002-6644-7046"},"institutions":[{"id":"https://openalex.org/I20231570","display_name":"Peking University","ror":"https://ror.org/02v51f717","country_code":"CN","type":"education","lineage":["https://openalex.org/I20231570"]}],"countries":["CN"],"is_corresponding":false,"raw_author_name":"Wei Zhang","raw_affiliation_strings":["EECS, Peking University, Beijing, China","Key Laboratory of High Confidence Software Technologies (Peking University), MoE, China"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"EECS, Peking University, Beijing, China","institution_ids":["https://openalex.org/I20231570"]},{"raw_affiliation_string":"Key Laboratory of High Confidence Software Technologies (Peking University), MoE, China","institution_ids":["https://openalex.org/I20231570"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5041545566","display_name":"Ailun Yu","orcid":"https://orcid.org/0009-0004-4707-4418"},"institutions":[{"id":"https://openalex.org/I20231570","display_name":"Peking University","ror":"https://ror.org/02v51f717","country_code":"CN","type":"education","lineage":["https://openalex.org/I20231570"]}],"countries":["CN"],"is_corresponding":false,"raw_author_name":"Ailun Yu","raw_affiliation_strings":["EECS, Peking University, Beijing, China","Key Laboratory of High Confidence Software Technologies (Peking University), MoE, China"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"EECS, Peking University, Beijing, China","institution_ids":["https://openalex.org/I20231570"]},{"raw_affiliation_string":"Key Laboratory of High Confidence Software Technologies (Peking University), MoE, China","institution_ids":["https://openalex.org/I20231570"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5085227264","display_name":"Yifan Shi","orcid":"https://orcid.org/0000-0001-6551-2697"},"institutions":[{"id":"https://openalex.org/I20231570","display_name":"Peking University","ror":"https://ror.org/02v51f717","country_code":"CN","type":"education","lineage":["https://openalex.org/I20231570"]}],"countries":["CN"],"is_corresponding":false,"raw_author_name":"Yifan Shi","raw_affiliation_strings":["EECS, Peking University, Beijing, China","Key Laboratory of High Confidence Software Technologies (Peking University), MoE, China"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"EECS, Peking University, Beijing, China","institution_ids":["https://openalex.org/I20231570"]},{"raw_affiliation_string":"Key Laboratory of High Confidence Software Technologies (Peking University), MoE, China","institution_ids":["https://openalex.org/I20231570"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5100738977","display_name":"Haiyan Zhao","orcid":"https://orcid.org/0000-0003-0202-5394"},"institutions":[{"id":"https://openalex.org/I20231570","display_name":"Peking University","ror":"https://ror.org/02v51f717","country_code":"CN","type":"education","lineage":["https://openalex.org/I20231570"]}],"countries":["CN"],"is_corresponding":false,"raw_author_name":"Haiyan Zhao","raw_affiliation_strings":["EECS, Peking University, Beijing, China","Key Laboratory of High Confidence Software Technologies (Peking University), MoE, China"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"EECS, Peking University, Beijing, China","institution_ids":["https://openalex.org/I20231570"]},{"raw_affiliation_string":"Key Laboratory of High Confidence Software Technologies (Peking University), MoE, China","institution_ids":["https://openalex.org/I20231570"]}]},{"author_position":"last","author":{"id":"https://openalex.org/A5049100391","display_name":"Zhi Jin","orcid":"https://orcid.org/0000-0003-1087-226X"},"institutions":[{"id":"https://openalex.org/I20231570","display_name":"Peking University","ror":"https://ror.org/02v51f717","country_code":"CN","type":"education","lineage":["https://openalex.org/I20231570"]}],"countries":["CN"],"is_corresponding":false,"raw_author_name":"Zhi Jin","raw_affiliation_strings":["EECS, Peking University, Beijing, China","Key Laboratory of High Confidence Software Technologies (Peking University), MoE, China"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"EECS, Peking University, Beijing, China","institution_ids":["https://openalex.org/I20231570"]},{"raw_affiliation_string":"Key Laboratory of High Confidence Software Technologies (Peking University), MoE, China","institution_ids":["https://openalex.org/I20231570"]}]}],"institutions":[],"countries_distinct_count":1,"institutions_distinct_count":1,"corresponding_author_ids":[],"corresponding_institution_ids":["https://openalex.org/I20231570"],"apc_list":null,"apc_paid":null,"fwci":null,"has_fulltext":false,"cited_by_count":9,"citation_normalized_percentile":null,"cited_by_percentile_year":null,"biblio":{"volume":null,"issue":null,"first_page":"1291","last_page":"1295"},"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/T10430","display_name":"Software Engineering Techniques and Practices","score":0.9973000288009644,"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/T10639","display_name":"Advanced Software Engineering Methodologies","score":0.9958999752998352,"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/computer-science","display_name":"Computer science","score":0.8451879024505615},{"id":"https://openalex.org/keywords/java","display_name":"Java","score":0.6261886954307556},{"id":"https://openalex.org/keywords/programming-language","display_name":"Programming language","score":0.6152910590171814},{"id":"https://openalex.org/keywords/merge","display_name":"Merge (version control)","score":0.6095479726791382},{"id":"https://openalex.org/keywords/source-code","display_name":"Source code","score":0.5120583176612854},{"id":"https://openalex.org/keywords/javascript","display_name":"JavaScript","score":0.4772784113883972},{"id":"https://openalex.org/keywords/plug-in","display_name":"Plug-in","score":0.42840060591697693},{"id":"https://openalex.org/keywords/theoretical-computer-science","display_name":"Theoretical computer science","score":0.4070325493812561},{"id":"https://openalex.org/keywords/information-retrieval","display_name":"Information retrieval","score":0.25925639271736145}],"concepts":[{"id":"https://openalex.org/C41008148","wikidata":"https://www.wikidata.org/wiki/Q21198","display_name":"Computer science","level":0,"score":0.8451879024505615},{"id":"https://openalex.org/C548217200","wikidata":"https://www.wikidata.org/wiki/Q251","display_name":"Java","level":2,"score":0.6261886954307556},{"id":"https://openalex.org/C199360897","wikidata":"https://www.wikidata.org/wiki/Q9143","display_name":"Programming language","level":1,"score":0.6152910590171814},{"id":"https://openalex.org/C197129107","wikidata":"https://www.wikidata.org/wiki/Q1921621","display_name":"Merge (version control)","level":2,"score":0.6095479726791382},{"id":"https://openalex.org/C43126263","wikidata":"https://www.wikidata.org/wiki/Q128751","display_name":"Source code","level":2,"score":0.5120583176612854},{"id":"https://openalex.org/C544833334","wikidata":"https://www.wikidata.org/wiki/Q2005","display_name":"JavaScript","level":2,"score":0.4772784113883972},{"id":"https://openalex.org/C4924752","wikidata":"https://www.wikidata.org/wiki/Q184148","display_name":"Plug-in","level":2,"score":0.42840060591697693},{"id":"https://openalex.org/C80444323","wikidata":"https://www.wikidata.org/wiki/Q2878974","display_name":"Theoretical computer science","level":1,"score":0.4070325493812561},{"id":"https://openalex.org/C23123220","wikidata":"https://www.wikidata.org/wiki/Q816826","display_name":"Information retrieval","level":1,"score":0.25925639271736145}],"mesh":[],"locations_count":1,"locations":[{"id":"doi:10.1109/ase51524.2021.9678937","is_oa":false,"landing_page_url":"https://doi.org/10.1109/ase51524.2021.9678937","pdf_url":null,"source":{"id":"https://openalex.org/S4363608212","display_name":"2021 36th IEEE/ACM International Conference on Automated Software Engineering (ASE)","issn_l":null,"issn":null,"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":"conference"},"license":null,"license_id":null,"version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"2021 36th IEEE/ACM International Conference on Automated Software Engineering (ASE)","raw_type":"proceedings-article"}],"best_oa_location":null,"sustainable_development_goals":[{"id":"https://metadata.un.org/sdg/17","display_name":"Partnerships for the goals","score":0.44999998807907104}],"awards":[],"funders":[{"id":"https://openalex.org/F4320321001","display_name":"National Natural Science Foundation of China","ror":"https://ror.org/01h0zpd94"}],"has_content":{"grobid_xml":false,"pdf":false},"content_urls":null,"referenced_works_count":27,"referenced_works":["https://openalex.org/W2020874073","https://openalex.org/W2046368237","https://openalex.org/W2057432538","https://openalex.org/W2121668868","https://openalex.org/W2144160189","https://openalex.org/W2168677022","https://openalex.org/W2620791874","https://openalex.org/W2752338701","https://openalex.org/W2761459579","https://openalex.org/W2767854151","https://openalex.org/W2773906175","https://openalex.org/W2804507477","https://openalex.org/W2890081359","https://openalex.org/W2898225668","https://openalex.org/W2898878827","https://openalex.org/W2912237649","https://openalex.org/W2921598771","https://openalex.org/W2979977910","https://openalex.org/W2980382762","https://openalex.org/W3000437183","https://openalex.org/W3048356987","https://openalex.org/W3097717691","https://openalex.org/W3132164479","https://openalex.org/W3161853930","https://openalex.org/W3162620983","https://openalex.org/W6791184579","https://openalex.org/W6794712572"],"related_works":["https://openalex.org/W47352601","https://openalex.org/W2981957539","https://openalex.org/W4287378204","https://openalex.org/W2545422590","https://openalex.org/W4240705470","https://openalex.org/W2945311252","https://openalex.org/W631546281","https://openalex.org/W4206501676","https://openalex.org/W88292646","https://openalex.org/W2266220644"],"abstract_inverted_index":{"Code":[0,118],"merging":[1,31],"plays":[2],"an":[3],"important":[4],"role":[5],"in":[6,133],"collaborative":[7],"software":[8],"development.":[9],"However,":[10],"it":[11],"is":[12,130,140],"often":[13],"tedious":[14],"and":[15,70,77,126],"error-prone":[16],"for":[17,103],"developers":[18,48],"to":[19,46,66],"manually":[20],"resolve":[21,49],"merge":[22,50],"conflicts,":[23],"especially":[24],"when":[25],"there":[26],"are":[27],"many":[28],"conflicts":[29,51,89,105],"after":[30],"long-lived":[32],"branches":[33],"or":[34],"parallel":[35],"versions.":[36],"In":[37],"this":[38],"paper,":[39],"we":[40],"present":[41],"SoManyConflicts,":[42],"a":[43,63,115],"language-agnostic":[44],"approach":[45],"help":[47],"systematically,":[52],"by":[53],"utilizing":[54],"their":[55],"interrelations":[56,69],"(e.g.,":[57],"dependency,":[58],"similarity,":[59],"etc.).":[60],"SoManyConflicts":[61,113],"employs":[62],"graph":[64,84],"representation":[65],"model":[67],"these":[68],"provides":[71],"3":[72],"major":[73],"features:":[74],"1)":[75],"cluster":[76],"order":[78],"related":[79,88],"conflict":[80,93],"based":[81,94,106],"on":[82,95],"the":[83,96,134],"connectivity;":[85],"2)":[86],"suggest":[87,100],"of":[90],"one":[91],"focused":[92],"topological":[97],"sorting,":[98],"3)":[99],"resolution":[101],"strategies":[102],"unresolved":[104],"already":[107],"resolved":[108],"ones.":[109],"We":[110],"have":[111],"implemented":[112],"as":[114],"Visual":[116],"Studio":[117],"extension":[119],"that":[120],"supports":[121],"multiple":[122],"languages":[123],"(Java,":[124],"JavaScript,":[125],"TypeScript,":[127],"etc.),":[128],"which":[129],"briefly":[131],"introduced":[132],"video:":[135],"https://youtu.be/asWhj1KTU.":[136],"The":[137],"source":[138],"code":[139],"publicly":[141],"available":[142],"at:":[143],"https://github.com/Symbolk/somanyconflicts.":[144]},"counts_by_year":[{"year":2025,"cited_by_count":4},{"year":2023,"cited_by_count":4},{"year":2022,"cited_by_count":1}],"updated_date":"2026-07-14T23:27:15.235271","created_date":"2025-10-10T00:00:00"}