{"id":"https://openalex.org/W2890081359","doi":"https://doi.org/10.1109/tse.2018.2871083","title":"On the Nature of Merge Conflicts: A Study of 2,731 Open Source Java Projects Hosted by GitHub","display_name":"On the Nature of Merge Conflicts: A Study of 2,731 Open Source Java Projects Hosted by GitHub","publication_year":2018,"publication_date":"2018-09-19","ids":{"openalex":"https://openalex.org/W2890081359","doi":"https://doi.org/10.1109/tse.2018.2871083","mag":"2890081359"},"language":"en","primary_location":{"id":"doi:10.1109/tse.2018.2871083","is_oa":false,"landing_page_url":"https://doi.org/10.1109/tse.2018.2871083","pdf_url":null,"source":{"id":"https://openalex.org/S8351582","display_name":"IEEE Transactions on Software Engineering","issn_l":"0098-5589","issn":["0098-5589","1939-3520","2326-3881"],"is_oa":false,"is_in_doaj":false,"is_core":true,"host_organization":"https://openalex.org/P4310320439","host_organization_name":"IEEE Computer Society","host_organization_lineage":["https://openalex.org/P4310320439","https://openalex.org/P4310319808"],"host_organization_lineage_names":["IEEE Computer Society","Institute of Electrical and Electronics Engineers"],"type":"journal"},"license":null,"license_id":null,"version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"IEEE Transactions on Software Engineering","raw_type":"journal-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/A5074891651","display_name":"Gleiph Ghiotto","orcid":"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"]},{"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":true,"raw_author_name":"Gleiph Ghiotto","raw_affiliation_strings":["Computer Science Department, Federal University of Juiz de Fora, Juiz de Fora, Brazil","Computing Institute, Fluminense Federal University, Niter\u00f3i, Brazil"],"affiliations":[{"raw_affiliation_string":"Computer Science Department, Federal University of Juiz de Fora, Juiz de Fora, Brazil","institution_ids":["https://openalex.org/I101100930"]},{"raw_affiliation_string":"Computing Institute, Fluminense Federal University, Niter\u00f3i, Brazil","institution_ids":["https://openalex.org/I161127581"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5102931782","display_name":"Leonardo Murta","orcid":"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 Murta","raw_affiliation_strings":["Computing Institute, Fluminense Federal University, Niter\u00f3i, Brazil"],"affiliations":[{"raw_affiliation_string":"Computing Institute, Fluminense Federal University, Niter\u00f3i, Brazil","institution_ids":["https://openalex.org/I161127581"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5030983360","display_name":"M\u00e1rcio de Oliveira Barros","orcid":"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":"Marcio Barros","raw_affiliation_strings":["Information Systems Program, UNIRIO, Rio de Janeiro, Brazil"],"affiliations":[{"raw_affiliation_string":"Information Systems Program, UNIRIO, Rio de Janeiro, Brazil","institution_ids":["https://openalex.org/I83648350"]}]},{"author_position":"last","author":{"id":"https://openalex.org/A5042967020","display_name":"Andr\u00e9 van der Hoek","orcid":"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":"Andre van der Hoek","raw_affiliation_strings":["Department of Informatics, University of California Irvine, Irvine, USA"],"affiliations":[{"raw_affiliation_string":"Department of Informatics, University of California Irvine, Irvine, USA","institution_ids":["https://openalex.org/I204250578"]}]}],"institutions":[],"countries_distinct_count":2,"institutions_distinct_count":4,"corresponding_author_ids":["https://openalex.org/A5074891651"],"corresponding_institution_ids":["https://openalex.org/I101100930","https://openalex.org/I161127581"],"apc_list":null,"apc_paid":null,"fwci":9.4489,"has_fulltext":false,"cited_by_count":63,"citation_normalized_percentile":{"value":0.98007629,"is_in_top_1_percent":false,"is_in_top_10_percent":true},"cited_by_percentile_year":{"min":97,"max":99},"biblio":{"volume":"46","issue":"8","first_page":"892","last_page":"915"},"is_retracted":false,"is_paratext":false,"is_xpac":false,"primary_topic":{"id":"https://openalex.org/T10260","display_name":"Software Engineering Research","score":0.9998000264167786,"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.9998000264167786,"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.9997000098228455,"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"}},{"id":"https://openalex.org/T10430","display_name":"Software Engineering Techniques and Practices","score":0.9987000226974487,"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"}}],"keywords":[{"id":"https://openalex.org/keywords/merge","display_name":"Merge (version control)","score":0.8495519757270813},{"id":"https://openalex.org/keywords/computer-science","display_name":"Computer science","score":0.7967952489852905},{"id":"https://openalex.org/keywords/java","display_name":"Java","score":0.6807128190994263},{"id":"https://openalex.org/keywords/merge-algorithm","display_name":"Merge algorithm","score":0.5002951622009277},{"id":"https://openalex.org/keywords/software","display_name":"Software","score":0.47955796122550964},{"id":"https://openalex.org/keywords/software-engineering","display_name":"Software engineering","score":0.42750293016433716},{"id":"https://openalex.org/keywords/programming-language","display_name":"Programming language","score":0.39569732546806335},{"id":"https://openalex.org/keywords/information-retrieval","display_name":"Information retrieval","score":0.22062012553215027}],"concepts":[{"id":"https://openalex.org/C197129107","wikidata":"https://www.wikidata.org/wiki/Q1921621","display_name":"Merge (version control)","level":2,"score":0.8495519757270813},{"id":"https://openalex.org/C41008148","wikidata":"https://www.wikidata.org/wiki/Q21198","display_name":"Computer science","level":0,"score":0.7967952489852905},{"id":"https://openalex.org/C548217200","wikidata":"https://www.wikidata.org/wiki/Q251","display_name":"Java","level":2,"score":0.6807128190994263},{"id":"https://openalex.org/C140086265","wikidata":"https://www.wikidata.org/wiki/Q11341754","display_name":"Merge algorithm","level":4,"score":0.5002951622009277},{"id":"https://openalex.org/C2777904410","wikidata":"https://www.wikidata.org/wiki/Q7397","display_name":"Software","level":2,"score":0.47955796122550964},{"id":"https://openalex.org/C115903868","wikidata":"https://www.wikidata.org/wiki/Q80993","display_name":"Software engineering","level":1,"score":0.42750293016433716},{"id":"https://openalex.org/C199360897","wikidata":"https://www.wikidata.org/wiki/Q9143","display_name":"Programming language","level":1,"score":0.39569732546806335},{"id":"https://openalex.org/C23123220","wikidata":"https://www.wikidata.org/wiki/Q816826","display_name":"Information retrieval","level":1,"score":0.22062012553215027},{"id":"https://openalex.org/C111696304","wikidata":"https://www.wikidata.org/wiki/Q2303697","display_name":"Sorting","level":2,"score":0.0},{"id":"https://openalex.org/C108094655","wikidata":"https://www.wikidata.org/wiki/Q181593","display_name":"Sorting algorithm","level":3,"score":0.0}],"mesh":[],"locations_count":1,"locations":[{"id":"doi:10.1109/tse.2018.2871083","is_oa":false,"landing_page_url":"https://doi.org/10.1109/tse.2018.2871083","pdf_url":null,"source":{"id":"https://openalex.org/S8351582","display_name":"IEEE Transactions on Software Engineering","issn_l":"0098-5589","issn":["0098-5589","1939-3520","2326-3881"],"is_oa":false,"is_in_doaj":false,"is_core":true,"host_organization":"https://openalex.org/P4310320439","host_organization_name":"IEEE Computer Society","host_organization_lineage":["https://openalex.org/P4310320439","https://openalex.org/P4310319808"],"host_organization_lineage_names":["IEEE Computer Society","Institute of Electrical and Electronics Engineers"],"type":"journal"},"license":null,"license_id":null,"version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"IEEE Transactions on Software Engineering","raw_type":"journal-article"}],"best_oa_location":null,"sustainable_development_goals":[{"score":0.5299999713897705,"id":"https://metadata.un.org/sdg/17","display_name":"Partnerships for the goals"}],"awards":[{"id":"https://openalex.org/G7731986869","display_name":null,"funder_award_id":"CCF-1414197","funder_id":"https://openalex.org/F4320306076","funder_display_name":"National Science Foundation"}],"funders":[{"id":"https://openalex.org/F4320306076","display_name":"National Science Foundation","ror":"https://ror.org/021nxhr62"},{"id":"https://openalex.org/F4320321091","display_name":"Coordena\u00e7\u00e3o de Aperfei\u00e7oamento de Pessoal de N\u00edvel Superior","ror":"https://ror.org/00x0ma614"},{"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/F4320322749","display_name":"Funda\u00e7\u00e3o Carlos Chagas Filho de Amparo \u00e0 Pesquisa do Estado do Rio de Janeiro","ror":"https://ror.org/03kk0s825"}],"has_content":{"pdf":false,"grobid_xml":false},"content_urls":null,"referenced_works_count":50,"referenced_works":["https://openalex.org/W1509213251","https://openalex.org/W1555563117","https://openalex.org/W1564363189","https://openalex.org/W1913262293","https://openalex.org/W1971741152","https://openalex.org/W1972503075","https://openalex.org/W1977678951","https://openalex.org/W1986466161","https://openalex.org/W2007267771","https://openalex.org/W2020874073","https://openalex.org/W2021487990","https://openalex.org/W2025160864","https://openalex.org/W2034683285","https://openalex.org/W2038013574","https://openalex.org/W2043860522","https://openalex.org/W2046368237","https://openalex.org/W2049134176","https://openalex.org/W2073456972","https://openalex.org/W2094944943","https://openalex.org/W2096800101","https://openalex.org/W2097985262","https://openalex.org/W2108169023","https://openalex.org/W2113255455","https://openalex.org/W2113371678","https://openalex.org/W2121668868","https://openalex.org/W2123802152","https://openalex.org/W2124782380","https://openalex.org/W2125470981","https://openalex.org/W2125981604","https://openalex.org/W2126101048","https://openalex.org/W2130200371","https://openalex.org/W2147397672","https://openalex.org/W2151541805","https://openalex.org/W2151803774","https://openalex.org/W2155951198","https://openalex.org/W2161946348","https://openalex.org/W2167626029","https://openalex.org/W2297048691","https://openalex.org/W2336987377","https://openalex.org/W2755680275","https://openalex.org/W2761459579","https://openalex.org/W2767854151","https://openalex.org/W2773906175","https://openalex.org/W2776762819","https://openalex.org/W2781544761","https://openalex.org/W3146893295","https://openalex.org/W4250245284","https://openalex.org/W6630436634","https://openalex.org/W6676781384","https://openalex.org/W6746902714"],"related_works":["https://openalex.org/W1997715509","https://openalex.org/W2356015003","https://openalex.org/W2074050947","https://openalex.org/W1838431648","https://openalex.org/W2156833550","https://openalex.org/W2006931095","https://openalex.org/W2060029658","https://openalex.org/W4237134732","https://openalex.org/W1594272482","https://openalex.org/W2388800952"],"abstract_inverted_index":{"When":[0],"multiple":[1],"developers":[2,98,179],"change":[3],"a":[4,63,68],"software":[5,21],"system":[6],"in":[7,19,62,94,128,160,225],"parallel,":[8],"these":[9,86,183],"concurrent":[10],"changes":[11],"need":[12],"to":[13,16,30,54,71,181,207,243],"be":[14,253],"merged":[15],"all":[17,58,152],"appear":[18],"the":[20,41,74,83,114,124,129,139,143,157,174,189,195,199,234,238],"being":[22],"developed.":[23],"Numerous":[24],"merge":[25,42,59,64,87,109,125,158,184,196,213],"techniques":[26,110],"have":[27,79],"been":[28,47],"proposed":[29],"support":[31],"this":[32],"task,":[33],"but":[34],"none":[35],"of":[36,57,85,123,131,142,145,151,162,164,194,230,249],"them":[37],"can":[38],"fully":[39],"automate":[40],"process.":[43],"Indeed,":[44],"it":[45],"has":[46,70],"reported":[48],"that":[49,67,105,111,178,215,251],"as":[50,52],"much":[51],"10":[53],"20":[55],"percent":[56],"attempts":[60],"result":[61],"conflict,":[65],"meaning":[66],"developer":[69,239],"manually":[72],"complete":[73],"merge.":[75],"To":[76],"date,":[77],"we":[78],"little":[80],"insight":[81],"into":[82],"nature":[84],"conflicts.":[88],"What":[89],"do":[90,97],"they":[91],"look":[92],"like,":[93],"detail?":[95],"How":[96],"resolve":[99,246],"them?":[100],"Do":[101],"any":[102],"patterns":[103],"exist":[104],"might":[106],"suggest":[107],"new":[108],"could":[112,220],"reduce":[113],"manual":[115,140,175],"effort?":[116],"This":[117],"paper":[118],"contributes":[119],"an":[120],"in-depth":[121],"study":[122],"conflicts":[126,159,197,231,250],"found":[127],"histories":[130,144],"2,731":[132,153],"open":[133],"source":[134],"Java":[135],"projects.":[136],"Seeded":[137],"by":[138],"analysis":[141,150],"five":[146],"projects,":[147],"our":[148],"automated":[149],"projects:":[154],"(1)":[155],"characterizes":[156],"terms":[161],"number":[163],"chunks,":[165],"size,":[166],"and":[167,186,198,232],"programming":[168],"language":[169],"constructs":[170],"involved,":[171],"(2)":[172],"classifies":[173],"resolution":[176,201],"strategies":[177],"use":[180],"address":[182],"conflicts,":[185],"(3)":[187],"analyzes":[188],"relationships":[190],"between":[191],"various":[192],"characteristics":[193],"chosen":[200],"strategies.":[202],"Our":[203],"results":[204],"give":[205],"rise":[206],"three":[208],"primary":[209],"recommendations":[210],"for":[211],"future":[212],"techniques,":[214],"-":[216,219],"when":[217],"implemented":[218],"on":[221,233],"one":[222],"hand":[223,236],"help":[224],"automatically":[226,254],"resolving":[227],"certain":[228],"types":[229,248],"other":[235,247],"provide":[237],"with":[240],"tool-based":[241],"assistance":[242],"more":[244],"easily":[245],"cannot":[252],"resolved.":[255]},"counts_by_year":[{"year":2025,"cited_by_count":7},{"year":2024,"cited_by_count":9},{"year":2023,"cited_by_count":9},{"year":2022,"cited_by_count":15},{"year":2021,"cited_by_count":10},{"year":2020,"cited_by_count":5},{"year":2019,"cited_by_count":8}],"updated_date":"2026-03-27T05:58:40.876381","created_date":"2025-10-10T00:00:00"}