{"id":"https://openalex.org/W4296534829","doi":"https://doi.org/10.1145/3555228.3555229","title":"Towards Merge Conflict Resolution by Combining Existing Lines of Code","display_name":"Towards Merge Conflict Resolution by Combining Existing Lines of Code","publication_year":2022,"publication_date":"2022-09-20","ids":{"openalex":"https://openalex.org/W4296534829","doi":"https://doi.org/10.1145/3555228.3555229"},"language":"en","primary_location":{"id":"doi:10.1145/3555228.3555229","doi":"https://doi.org/10.1145/3555228.3555229","is_oa":false,"landing_page_url":"https://doi.org/10.1145/3555228.3555229","pdf_url":null,"source":{"id":"https://openalex.org/S4306417862","display_name":"Brazilian Symposium on Software Engineering","issn_l":null,"issn":null,"is_oa":false,"is_in_doaj":false,"is_core":false,"listed_in":[],"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":"Proceedings of the XXXVI Brazilian Symposium on Software Engineering","raw_type":"proceedings-article"},"volume":null,"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/A5021761918","display_name":"Heleno de S. Campos","orcid":"https://orcid.org/0000-0001-5541-0021","observed_orcids":["https://orcid.org/0000-0001-5541-0021"]},"institutions":[{"id":"https://openalex.org/I161127581","display_name":"Universidade Federal Fluminense","ror":"https://ror.org/02rjhbb08","country_code":"BR","type":"education","lineage":["https://openalex.org/I161127581"]}],"countries":["BR"],"is_corresponding":false,"raw_author_name":"Heleno de S. Campos Junior","raw_affiliation_strings":["Universidade Federal Fluminense, Brazil"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"Universidade Federal Fluminense, Brazil","institution_ids":["https://openalex.org/I161127581"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5074891651","display_name":"Gleiph Ghiotto","orcid":"https://orcid.org/0000-0002-8480-676X","observed_orcids":["https://orcid.org/0000-0002-8480-676X"]},"institutions":[{"id":"https://openalex.org/I101100930","display_name":"Universidade Federal de Juiz de Fora","ror":"https://ror.org/04yqw9c44","country_code":"BR","type":"education","lineage":["https://openalex.org/I101100930"]}],"countries":["BR"],"is_corresponding":false,"raw_author_name":"Gleiph Ghiotto L. de Menezes","raw_affiliation_strings":["Universidade Federal de Juiz de Fora, Brazil"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"Universidade Federal de Juiz de Fora, Brazil","institution_ids":["https://openalex.org/I101100930"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5030983360","display_name":"M\u00e1rcio de Oliveira Barros","orcid":"https://orcid.org/0000-0001-8136-9624","observed_orcids":["https://orcid.org/0000-0001-8136-9624"]},"institutions":[{"id":"https://openalex.org/I83648350","display_name":"Universidade Federal do Estado do Rio de Janeiro","ror":"https://ror.org/04tec8z30","country_code":"BR","type":"education","lineage":["https://openalex.org/I83648350"]}],"countries":["BR"],"is_corresponding":false,"raw_author_name":"M\u00e1rcio de Oliveira Barros","raw_affiliation_strings":["Universidade Federal do Estado do Rio de Janeiro, Brazil"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"Universidade Federal do Estado do Rio de Janeiro, Brazil","institution_ids":["https://openalex.org/I83648350"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5042967020","display_name":"Andr\u00e9 van der Hoek","orcid":"https://orcid.org/0000-0001-7917-932X","observed_orcids":["https://orcid.org/0000-0001-7917-932X"]},"institutions":[{"id":"https://openalex.org/I204250578","display_name":"University of California, Irvine","ror":"https://ror.org/04gyf1771","country_code":"US","type":"education","lineage":["https://openalex.org/I204250578"]}],"countries":["US"],"is_corresponding":false,"raw_author_name":"Andr\u00e9 van der Hoek","raw_affiliation_strings":["University of California, Irvine, USA"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"University of California, Irvine, USA","institution_ids":["https://openalex.org/I204250578"]}]},{"author_position":"last","author":{"id":"https://openalex.org/A5102931782","display_name":"Leonardo Murta","orcid":"https://orcid.org/0000-0002-5173-1247","observed_orcids":["https://orcid.org/0000-0002-5173-1247"]},"institutions":[{"id":"https://openalex.org/I161127581","display_name":"Universidade Federal Fluminense","ror":"https://ror.org/02rjhbb08","country_code":"BR","type":"education","lineage":["https://openalex.org/I161127581"]}],"countries":["BR"],"is_corresponding":false,"raw_author_name":"Leonardo Gresta Paulino Murta","raw_affiliation_strings":["Universidade Federal Fluminense, Brazil"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"Universidade Federal Fluminense, Brazil","institution_ids":["https://openalex.org/I161127581"]}]}],"institutions":[],"countries_distinct_count":2,"institutions_distinct_count":4,"corresponding_author_ids":[],"corresponding_institution_ids":[],"apc_list":null,"apc_paid":null,"fwci":0.447,"has_fulltext":false,"cited_by_count":3,"citation_normalized_percentile":{"value":0.59168969,"is_in_top_1_percent":false,"is_in_top_10_percent":false},"cited_by_percentile_year":{"min":89,"max":96},"biblio":{"volume":null,"issue":null,"first_page":"425","last_page":"434"},"is_retracted":false,"is_paratext":false,"is_xpac":false,"primary_topic":{"id":"https://openalex.org/T10260","display_name":"Software Engineering Research","score":0.9955999851226807,"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.9955999851226807,"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.003800000064074993,"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":9.999999747378752e-05,"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-conflicts","display_name":"merge conflicts","score":0.9340000152587891},{"id":"https://openalex.org/keywords/merge-conflict-resolution","display_name":"merge conflict resolution","score":0.9559999704360962},{"id":"https://openalex.org/keywords/search-space-reduction","display_name":"search space reduction","score":0.6579999923706055},{"id":"https://openalex.org/keywords/search-based-software-engineering","display_name":"search-based software engineering","score":0.7929999828338623}],"concepts":[{"id":"https://openalex.org/C197129107","wikidata":"https://www.wikidata.org/wiki/Q1921621","display_name":"Merge (version control)","level":2,"score":0.8875813484191895},{"id":"https://openalex.org/C199519371","wikidata":"https://www.wikidata.org/wiki/Q942695","display_name":"Source lines of code","level":3,"score":0.7720125913619995},{"id":"https://openalex.org/C127705205","wikidata":"https://www.wikidata.org/wiki/Q5748245","display_name":"Heuristics","level":2,"score":0.7588416337966919},{"id":"https://openalex.org/C41008148","wikidata":"https://www.wikidata.org/wiki/Q21198","display_name":"Computer science","level":0,"score":0.7267927527427673},{"id":"https://openalex.org/C2777904410","wikidata":"https://www.wikidata.org/wiki/Q7397","display_name":"Software","level":2,"score":0.5829691886901855},{"id":"https://openalex.org/C43126263","wikidata":"https://www.wikidata.org/wiki/Q128751","display_name":"Source code","level":2,"score":0.4638836979866028},{"id":"https://openalex.org/C21711469","wikidata":"https://www.wikidata.org/wiki/Q1194317","display_name":"Conflict resolution","level":2,"score":0.4349161684513092},{"id":"https://openalex.org/C124101348","wikidata":"https://www.wikidata.org/wiki/Q172491","display_name":"Data mining","level":1,"score":0.38817062973976135},{"id":"https://openalex.org/C115903868","wikidata":"https://www.wikidata.org/wiki/Q80993","display_name":"Software engineering","level":1,"score":0.3640965521335602},{"id":"https://openalex.org/C199360897","wikidata":"https://www.wikidata.org/wiki/Q9143","display_name":"Programming language","level":1,"score":0.3544732332229614},{"id":"https://openalex.org/C23123220","wikidata":"https://www.wikidata.org/wiki/Q816826","display_name":"Information retrieval","level":1,"score":0.3261069059371948},{"id":"https://openalex.org/C199539241","wikidata":"https://www.wikidata.org/wiki/Q7748","display_name":"Law","level":1,"score":0.0},{"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/C111919701","wikidata":"https://www.wikidata.org/wiki/Q9135","display_name":"Operating system","level":1,"score":0.0}],"mesh":[],"locations_count":1,"locations":[{"id":"doi:10.1145/3555228.3555229","doi":"https://doi.org/10.1145/3555228.3555229","is_oa":false,"landing_page_url":"https://doi.org/10.1145/3555228.3555229","pdf_url":null,"source":{"id":"https://openalex.org/S4306417862","display_name":"Brazilian Symposium on Software Engineering","issn_l":null,"issn":null,"is_oa":false,"is_in_doaj":false,"is_core":false,"listed_in":[],"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":"Proceedings of the XXXVI Brazilian Symposium on Software Engineering","raw_type":"proceedings-article"}],"best_oa_location":null,"sustainable_development_goals":[],"study_designs":[],"awards":[{"id":"https://openalex.org/G6286622532","display_name":null,"funder_award_id":"311955/2020-7","funder_id":"https://openalex.org/F4320322025","funder_display_name":"Conselho Nacional de Desenvolvimento Cient\u00edfico e Tecnol\u00f3gico"}],"funders":[{"id":"https://openalex.org/F4320322025","display_name":"Conselho Nacional de Desenvolvimento Cient\u00edfico e Tecnol\u00f3gico","ror":"https://ror.org/03swz6y49"}],"has_content":{"grobid_xml":false,"pdf":false},"content_urls":null,"referenced_works_count":12,"referenced_works":["https://openalex.org/W1977321274","https://openalex.org/W1984575083","https://openalex.org/W2038013574","https://openalex.org/W2167626029","https://openalex.org/W2297048691","https://openalex.org/W2776762819","https://openalex.org/W2890081359","https://openalex.org/W2912237649","https://openalex.org/W2971805582","https://openalex.org/W3090703383","https://openalex.org/W3162620983","https://openalex.org/W3215914541"],"related_works":["https://openalex.org/W4404584331","https://openalex.org/W2890081359","https://openalex.org/W4386805386","https://openalex.org/W4399668119","https://openalex.org/W4412400182","https://openalex.org/W3215914541","https://openalex.org/W6925292344","https://openalex.org/W3132164479","https://openalex.org/W4283831104","https://openalex.org/W2469503863"],"abstract_inverted_index":{"Software":[0],"developers":[1,96],"often":[2],"need":[3],"to":[4,99],"combine":[5],"their":[6,46,109],"contributions.":[7],"This":[8],"operation":[9],"is":[10,28],"called":[11],"merge.":[12],"When":[13],"the":[14,18,23,26,38,128,132,135,138,147,173,176,182],"contributions":[15,156],"happen":[16],"at":[17,90],"same":[19],"physical":[20],"region":[21],"in":[22,137],"source":[24],"code,":[25],"merge":[27,62,169],"marked":[29],"as":[30,165],"conflicting":[31,106,139],"and":[32,48,92,108,121],"must":[33],"be":[34,66],"manually":[35],"resolved":[36,67,84],"by":[37,85,179],"developers.":[39],"Existing":[40],"studies":[41],"explore":[42],"why":[43],"conflicts":[44],"happen,":[45],"characteristics,":[47],"how":[49],"they":[50],"are":[51,111],"resolved.":[52],"In":[53],"this":[54,191],"paper,":[55],"we":[56],"investigate":[57],"a":[58,69,116],"specific":[59],"subset":[60],"of":[61,71,79,118,127,134,146,175],"conflicts,":[63],"which":[64],"may":[65],"using":[68],"combination":[70],"existing":[72,87],"lines.":[73],"We":[74,102,141],"analyze":[75],"10,177":[76],"conflict":[77],"chunks":[78,107],"popular":[80],"projects":[81],"that":[82,95,104,144],"were":[83],"combining":[86],"lines,":[88],"aiming":[89],"characterizing":[91],"finding":[93],"patterns":[94],"frequently":[97],"use":[98],"resolve":[100],"them.":[101],"found":[103,143],"these":[105],"resolutions":[110,130,149],"usually":[112],"small":[113],"(they":[114],"have":[115],"median":[117],"6":[119],"LOC":[120],"3":[122],"LOC,":[123],"respectively).":[124],"Moreover,":[125],"98.6%":[126],"analyzed":[129],"preserve":[131],"order":[133],"lines":[136,153],"chunks.":[140],"also":[142],"77.4%":[145],"chunk":[148],"do":[150],"not":[151],"interleave":[152],"from":[154],"different":[155],"more":[157],"than":[158],"once.":[159],"These":[160],"findings":[161],"altogether,":[162],"when":[163],"used":[164],"heuristics":[166],"for":[167,184,190],"automatic":[168],"resolution,":[170],"could":[171],"enable":[172],"reduction":[174],"search":[177],"space":[178],"94.7%,":[180],"paving":[181],"road":[183],"future":[185],"search-based":[186],"software":[187],"engineering":[188],"tools":[189],"problem.":[192]},"counts_by_year":[{"year":2026,"cited_by_count":1},{"year":2024,"cited_by_count":1},{"year":2023,"cited_by_count":1}],"updated_date":"2026-10-29T09:56:32.521200","created_date":"2022-09-21T00:00:00"}