{"id":"https://openalex.org/W4296534848","doi":"https://doi.org/10.1145/3555228.3555240","title":"The Private Life of Merge Conflicts","display_name":"The Private Life of Merge Conflicts","publication_year":2022,"publication_date":"2022-09-20","ids":{"openalex":"https://openalex.org/W4296534848","doi":"https://doi.org/10.1145/3555228.3555240"},"language":"en","primary_location":{"id":"doi:10.1145/3555228.3555240","is_oa":false,"landing_page_url":"https://doi.org/10.1145/3555228.3555240","pdf_url":null,"source":null,"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"},"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/A5108826243","display_name":"Marcela Cunha","orcid":null},"institutions":[{"id":"https://openalex.org/I25112270","display_name":"Universidade Federal de Pernambuco","ror":"https://ror.org/047908t24","country_code":"BR","type":"education","lineage":["https://openalex.org/I25112270"]}],"countries":["BR"],"is_corresponding":false,"raw_author_name":"Marcela Cunha","raw_affiliation_strings":["Universidade Federal de Pernambuco, Brazil"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"Universidade Federal de Pernambuco, Brazil","institution_ids":["https://openalex.org/I25112270"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5090754169","display_name":"Paola Accioly","orcid":"https://orcid.org/0000-0002-4428-2543"},"institutions":[{"id":"https://openalex.org/I4210090750","display_name":"Universidade Federal do Cariri","ror":"https://ror.org/00a4xxf76","country_code":"BR","type":"education","lineage":["https://openalex.org/I4210090750"]}],"countries":["BR"],"is_corresponding":false,"raw_author_name":"Paola Accioly","raw_affiliation_strings":["Universidade Federal do Cariri, Brazil"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"Universidade Federal do Cariri, Brazil","institution_ids":["https://openalex.org/I4210090750"]}]},{"author_position":"last","author":{"id":"https://openalex.org/A5073460644","display_name":"Paulo Borba","orcid":"https://orcid.org/0000-0002-0381-2843"},"institutions":[{"id":"https://openalex.org/I25112270","display_name":"Universidade Federal de Pernambuco","ror":"https://ror.org/047908t24","country_code":"BR","type":"education","lineage":["https://openalex.org/I25112270"]}],"countries":["BR"],"is_corresponding":false,"raw_author_name":"Paulo Borba","raw_affiliation_strings":["Universidade Federal de Pernambuco, Brazil"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"Universidade Federal de Pernambuco, Brazil","institution_ids":["https://openalex.org/I25112270"]}]}],"institutions":[],"countries_distinct_count":1,"institutions_distinct_count":3,"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.17850009,"is_in_top_1_percent":false,"is_in_top_10_percent":false},"cited_by_percentile_year":null,"biblio":{"volume":null,"issue":null,"first_page":"353","last_page":"362"},"is_retracted":false,"is_paratext":false,"is_xpac":false,"primary_topic":{"id":"https://openalex.org/T11437","display_name":"Digital Platforms and Economics","score":0.9129999876022339,"subfield":{"id":"https://openalex.org/subfields/1408","display_name":"Strategy and Management"},"field":{"id":"https://openalex.org/fields/14","display_name":"Business, Management and Accounting"},"domain":{"id":"https://openalex.org/domains/2","display_name":"Social Sciences"}},"topics":[{"id":"https://openalex.org/T11437","display_name":"Digital Platforms and Economics","score":0.9129999876022339,"subfield":{"id":"https://openalex.org/subfields/1408","display_name":"Strategy and Management"},"field":{"id":"https://openalex.org/fields/14","display_name":"Business, Management and Accounting"},"domain":{"id":"https://openalex.org/domains/2","display_name":"Social Sciences"}}],"keywords":[{"id":"https://openalex.org/keywords/merge","display_name":"Merge (version control)","score":0.7015880942344666},{"id":"https://openalex.org/keywords/computer-science","display_name":"Computer science","score":0.4923802614212036},{"id":"https://openalex.org/keywords/private-life","display_name":"Private life","score":0.4368923008441925},{"id":"https://openalex.org/keywords/political-science","display_name":"Political science","score":0.26080697774887085},{"id":"https://openalex.org/keywords/law","display_name":"Law","score":0.10988771915435791},{"id":"https://openalex.org/keywords/information-retrieval","display_name":"Information retrieval","score":0.09961891174316406}],"concepts":[{"id":"https://openalex.org/C197129107","wikidata":"https://www.wikidata.org/wiki/Q1921621","display_name":"Merge (version control)","level":2,"score":0.7015880942344666},{"id":"https://openalex.org/C41008148","wikidata":"https://www.wikidata.org/wiki/Q21198","display_name":"Computer science","level":0,"score":0.4923802614212036},{"id":"https://openalex.org/C2992203245","wikidata":"https://www.wikidata.org/wiki/Q56886387","display_name":"Private life","level":3,"score":0.4368923008441925},{"id":"https://openalex.org/C17744445","wikidata":"https://www.wikidata.org/wiki/Q36442","display_name":"Political science","level":0,"score":0.26080697774887085},{"id":"https://openalex.org/C199539241","wikidata":"https://www.wikidata.org/wiki/Q7748","display_name":"Law","level":1,"score":0.10988771915435791},{"id":"https://openalex.org/C23123220","wikidata":"https://www.wikidata.org/wiki/Q816826","display_name":"Information retrieval","level":1,"score":0.09961891174316406},{"id":"https://openalex.org/C169437150","wikidata":"https://www.wikidata.org/wiki/Q8458","display_name":"Human rights","level":2,"score":0.0}],"mesh":[],"locations_count":1,"locations":[{"id":"doi:10.1145/3555228.3555240","is_oa":false,"landing_page_url":"https://doi.org/10.1145/3555228.3555240","pdf_url":null,"source":null,"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":[{"id":"https://metadata.un.org/sdg/8","score":0.47999998927116394,"display_name":"Decent work and economic growth"}],"awards":[],"funders":[{"id":"https://openalex.org/F4320322025","display_name":"Conselho Nacional de Desenvolvimento Cient\u00edfico e Tecnol\u00f3gico","ror":"https://ror.org/03swz6y49"},{"id":"https://openalex.org/F4320323678","display_name":"Funda\u00e7\u00e3o de Amparo \u00e0 Ci\u00eancia e Tecnologia do Estado de Pernambuco","ror":"https://ror.org/02te5rf52"}],"has_content":{"pdf":false,"grobid_xml":false},"content_urls":null,"referenced_works_count":29,"referenced_works":["https://openalex.org/W1913262293","https://openalex.org/W1972503075","https://openalex.org/W1995969252","https://openalex.org/W1996993752","https://openalex.org/W2007267771","https://openalex.org/W2049134176","https://openalex.org/W2097985262","https://openalex.org/W2121668868","https://openalex.org/W2125981604","https://openalex.org/W2155951198","https://openalex.org/W2167626029","https://openalex.org/W2396912093","https://openalex.org/W2618269984","https://openalex.org/W2761459579","https://openalex.org/W2767854151","https://openalex.org/W2773906175","https://openalex.org/W2804507477","https://openalex.org/W2883343426","https://openalex.org/W2888746717","https://openalex.org/W2890081359","https://openalex.org/W3000085978","https://openalex.org/W3000457305","https://openalex.org/W3004836869","https://openalex.org/W3097717691","https://openalex.org/W3101419057","https://openalex.org/W3202010586","https://openalex.org/W4221045018","https://openalex.org/W4240309882","https://openalex.org/W4240966066"],"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":{"Collaborative":[0],"development":[1],"is":[2],"an":[3,151],"essential":[4],"practice":[5],"for":[6],"the":[7,31,69,96,104,126,162,214,245],"success":[8],"of":[9,71,98,106,125,165,168],"most":[10],"nontrivial":[11],"software":[12],"projects.":[13],"However,":[14,63],"merge":[15],"conflicts":[16,37],"might":[17,119,237],"occur":[18],"when":[19],"a":[20,24,166],"developer":[21],"integrates,":[22],"through":[23],"remote":[25,99,234],"shared":[26,73,100,235],"repository,":[27],"their":[28],"changes":[29,32],"with":[30],"from":[33,95,150,161,198],"other":[34],"developers.":[35,169,201],"Such":[36],"may":[38],"impair":[39],"developers\u2019":[40],"productivity":[41],"and":[42,54,131],"introduce":[43],"unexpected":[44],"defects.":[45],"Previous":[46],"empirical":[47,152],"studies":[48,65,118,230],"have":[49],"analyzed":[50],"such":[51,108],"conflict":[52,221,240],"characteristics":[53],"proposed":[55],"different":[56,200],"approaches":[57],"to":[58,68,103,141],"avoid":[59],"or":[60],"resolve":[61],"them.":[62],"these":[64],"are":[66,92,210],"limited":[67],"analysis":[70],"code":[72,88,128,207],"in":[74,136,188],"public":[75,184],"repositories.":[76],"This":[77,170],"way":[78,171],"they":[79],"ignore":[80],"local":[81,163,247],"(developer":[82],"private)":[83],"repository":[84,185,248],"actions":[85],"and,":[86],"consequently,":[87],"integration":[89,129,176,208,239],"scenarios":[90,130,177,209],"that":[91,154,178,205,229,231],"often":[93],"omitted":[94],"history":[97,158],"repositories":[101,164,236],"due":[102],"use":[105],"commands":[107],"as":[109,187],"git":[110,156,195],"rebase,":[111],"which":[112],"rewrite":[113],"Git":[114],"commit":[115],"history.":[116],"These":[117],"then":[120],"be":[121,180],"examining":[122],"only":[123,233],"part":[124],"actual":[127],"conflicts.":[132],"To":[133],"assess":[134],"that,":[135],"this":[137,145],"paper":[138],"we":[139,172],"aim":[140],"shed":[142],"light":[143],"on":[144],"issue":[146],"by":[147,182,242],"bringing":[148],"evidence":[149,227],"study":[153],"analyzes":[155],"command":[157],"data":[159,186,241],"extracted":[160],"number":[167],"can":[173],"access":[174],"hidden":[175,206],"cannot":[179],"accessed":[181],"analyzing":[183],"GitHub":[189],"based":[190],"studies.":[191,225],"We":[192,217],"analyze":[193],"95":[194],"reflog":[196],"files":[197],"61":[199],"Our":[202,226],"results":[203],"indicate":[204],"more":[211],"frequent":[212],"than":[213,223],"visible":[215],"ones.":[216],"also":[218],"find":[219],"higher":[220],"rates":[222],"previous":[224],"suggests":[228],"consider":[232],"loose":[238],"not":[243],"considering":[244],"developer\u2019s":[246],"actions.":[249]},"counts_by_year":[],"updated_date":"2026-06-11T09:08:48.828518","created_date":"2025-10-10T00:00:00"}