{"id":"https://openalex.org/W2912237649","doi":"https://doi.org/10.1007/s10664-018-9674-x","title":"The life-cycle of merge conflicts: processes, barriers, and strategies","display_name":"The life-cycle of merge conflicts: processes, barriers, and strategies","publication_year":2019,"publication_date":"2019-02-05","ids":{"openalex":"https://openalex.org/W2912237649","doi":"https://doi.org/10.1007/s10664-018-9674-x","mag":"2912237649"},"language":"en","primary_location":{"id":"doi:10.1007/s10664-018-9674-x","is_oa":false,"landing_page_url":"https://doi.org/10.1007/s10664-018-9674-x","pdf_url":null,"source":{"id":"https://openalex.org/S109852484","display_name":"Empirical Software Engineering","issn_l":"1382-3256","issn":["1382-3256","1573-7616"],"is_oa":false,"is_in_doaj":false,"is_core":true,"host_organization":"https://openalex.org/P4310319900","host_organization_name":"Springer Science+Business Media","host_organization_lineage":["https://openalex.org/P4310319900","https://openalex.org/P4310319965"],"host_organization_lineage_names":["Springer Science+Business Media","Springer Nature"],"type":"journal"},"license":null,"license_id":null,"version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"Empirical 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/A5091246530","display_name":"Nicholas Nelson","orcid":"https://orcid.org/0000-0002-6365-7152"},"institutions":[{"id":"https://openalex.org/I131249849","display_name":"Oregon State University","ror":"https://ror.org/00ysfqy60","country_code":"US","type":"education","lineage":["https://openalex.org/I131249849"]}],"countries":["US"],"is_corresponding":true,"raw_author_name":"Nicholas Nelson","raw_affiliation_strings":["Oregon State University, Corvallis, OR, 97331, USA"],"affiliations":[{"raw_affiliation_string":"Oregon State University, Corvallis, OR, 97331, USA","institution_ids":["https://openalex.org/I131249849"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5088514844","display_name":"Caius Brindescu","orcid":"https://orcid.org/0000-0003-1196-8749"},"institutions":[{"id":"https://openalex.org/I131249849","display_name":"Oregon State University","ror":"https://ror.org/00ysfqy60","country_code":"US","type":"education","lineage":["https://openalex.org/I131249849"]}],"countries":["US"],"is_corresponding":false,"raw_author_name":"Caius Brindescu","raw_affiliation_strings":["Oregon State University, Corvallis, OR, 97331, USA"],"affiliations":[{"raw_affiliation_string":"Oregon State University, Corvallis, OR, 97331, USA","institution_ids":["https://openalex.org/I131249849"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5053388608","display_name":"Shane McKee","orcid":"https://orcid.org/0000-0002-1772-0106"},"institutions":[{"id":"https://openalex.org/I131249849","display_name":"Oregon State University","ror":"https://ror.org/00ysfqy60","country_code":"US","type":"education","lineage":["https://openalex.org/I131249849"]}],"countries":["US"],"is_corresponding":false,"raw_author_name":"Shane McKee","raw_affiliation_strings":["Oregon State University, Corvallis, OR, 97331, USA"],"affiliations":[{"raw_affiliation_string":"Oregon State University, Corvallis, OR, 97331, USA","institution_ids":["https://openalex.org/I131249849"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5024821289","display_name":"Anita Sarma","orcid":"https://orcid.org/0000-0002-1859-1692"},"institutions":[{"id":"https://openalex.org/I131249849","display_name":"Oregon State University","ror":"https://ror.org/00ysfqy60","country_code":"US","type":"education","lineage":["https://openalex.org/I131249849"]}],"countries":["US"],"is_corresponding":false,"raw_author_name":"Anita Sarma","raw_affiliation_strings":["Oregon State University, Corvallis, OR, 97331, USA"],"affiliations":[{"raw_affiliation_string":"Oregon State University, Corvallis, OR, 97331, USA","institution_ids":["https://openalex.org/I131249849"]}]},{"author_position":"last","author":{"id":"https://openalex.org/A5019404521","display_name":"Danny Dig","orcid":"https://orcid.org/0000-0001-5046-2017"},"institutions":[{"id":"https://openalex.org/I131249849","display_name":"Oregon State University","ror":"https://ror.org/00ysfqy60","country_code":"US","type":"education","lineage":["https://openalex.org/I131249849"]}],"countries":["US"],"is_corresponding":false,"raw_author_name":"Danny Dig","raw_affiliation_strings":["Oregon State University, Corvallis, OR, 97331, USA"],"affiliations":[{"raw_affiliation_string":"Oregon State University, Corvallis, OR, 97331, USA","institution_ids":["https://openalex.org/I131249849"]}]}],"institutions":[],"countries_distinct_count":1,"institutions_distinct_count":5,"corresponding_author_ids":["https://openalex.org/A5091246530"],"corresponding_institution_ids":["https://openalex.org/I131249849"],"apc_list":{"value":2290,"currency":"EUR","value_usd":2890},"apc_paid":null,"fwci":6.6933,"has_fulltext":false,"cited_by_count":37,"citation_normalized_percentile":{"value":0.96770557,"is_in_top_1_percent":false,"is_in_top_10_percent":true},"cited_by_percentile_year":{"min":90,"max":99},"biblio":{"volume":"24","issue":"5","first_page":"2863","last_page":"2906"},"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.9994000196456909,"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/T11675","display_name":"Open Source Software Innovations","score":0.9973999857902527,"subfield":{"id":"https://openalex.org/subfields/1706","display_name":"Computer Science Applications"},"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.8528944253921509},{"id":"https://openalex.org/keywords/workflow","display_name":"Workflow","score":0.6910088658332825},{"id":"https://openalex.org/keywords/computer-science","display_name":"Computer science","score":0.676666259765625},{"id":"https://openalex.org/keywords/perception","display_name":"Perception","score":0.6280779838562012},{"id":"https://openalex.org/keywords/correctness","display_name":"Correctness","score":0.6070747971534729},{"id":"https://openalex.org/keywords/software","display_name":"Software","score":0.47234097123146057},{"id":"https://openalex.org/keywords/software-engineering","display_name":"Software engineering","score":0.43462932109832764},{"id":"https://openalex.org/keywords/knowledge-management","display_name":"Knowledge management","score":0.4019174873828888},{"id":"https://openalex.org/keywords/data-science","display_name":"Data science","score":0.38898947834968567},{"id":"https://openalex.org/keywords/psychology","display_name":"Psychology","score":0.10320299863815308},{"id":"https://openalex.org/keywords/database","display_name":"Database","score":0.09728530049324036}],"concepts":[{"id":"https://openalex.org/C197129107","wikidata":"https://www.wikidata.org/wiki/Q1921621","display_name":"Merge (version control)","level":2,"score":0.8528944253921509},{"id":"https://openalex.org/C177212765","wikidata":"https://www.wikidata.org/wiki/Q627335","display_name":"Workflow","level":2,"score":0.6910088658332825},{"id":"https://openalex.org/C41008148","wikidata":"https://www.wikidata.org/wiki/Q21198","display_name":"Computer science","level":0,"score":0.676666259765625},{"id":"https://openalex.org/C26760741","wikidata":"https://www.wikidata.org/wiki/Q160402","display_name":"Perception","level":2,"score":0.6280779838562012},{"id":"https://openalex.org/C55439883","wikidata":"https://www.wikidata.org/wiki/Q360812","display_name":"Correctness","level":2,"score":0.6070747971534729},{"id":"https://openalex.org/C2777904410","wikidata":"https://www.wikidata.org/wiki/Q7397","display_name":"Software","level":2,"score":0.47234097123146057},{"id":"https://openalex.org/C115903868","wikidata":"https://www.wikidata.org/wiki/Q80993","display_name":"Software engineering","level":1,"score":0.43462932109832764},{"id":"https://openalex.org/C56739046","wikidata":"https://www.wikidata.org/wiki/Q192060","display_name":"Knowledge management","level":1,"score":0.4019174873828888},{"id":"https://openalex.org/C2522767166","wikidata":"https://www.wikidata.org/wiki/Q2374463","display_name":"Data science","level":1,"score":0.38898947834968567},{"id":"https://openalex.org/C15744967","wikidata":"https://www.wikidata.org/wiki/Q9418","display_name":"Psychology","level":0,"score":0.10320299863815308},{"id":"https://openalex.org/C77088390","wikidata":"https://www.wikidata.org/wiki/Q8513","display_name":"Database","level":1,"score":0.09728530049324036},{"id":"https://openalex.org/C169760540","wikidata":"https://www.wikidata.org/wiki/Q207011","display_name":"Neuroscience","level":1,"score":0.0},{"id":"https://openalex.org/C23123220","wikidata":"https://www.wikidata.org/wiki/Q816826","display_name":"Information retrieval","level":1,"score":0.0},{"id":"https://openalex.org/C199360897","wikidata":"https://www.wikidata.org/wiki/Q9143","display_name":"Programming language","level":1,"score":0.0}],"mesh":[],"locations_count":1,"locations":[{"id":"doi:10.1007/s10664-018-9674-x","is_oa":false,"landing_page_url":"https://doi.org/10.1007/s10664-018-9674-x","pdf_url":null,"source":{"id":"https://openalex.org/S109852484","display_name":"Empirical Software Engineering","issn_l":"1382-3256","issn":["1382-3256","1573-7616"],"is_oa":false,"is_in_doaj":false,"is_core":true,"host_organization":"https://openalex.org/P4310319900","host_organization_name":"Springer Science+Business Media","host_organization_lineage":["https://openalex.org/P4310319900","https://openalex.org/P4310319965"],"host_organization_lineage_names":["Springer Science+Business Media","Springer Nature"],"type":"journal"},"license":null,"license_id":null,"version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"Empirical Software Engineering","raw_type":"journal-article"}],"best_oa_location":null,"sustainable_development_goals":[],"awards":[{"id":"https://openalex.org/G3160974733","display_name":null,"funder_award_id":"1553741","funder_id":"https://openalex.org/F4320337387","funder_display_name":"Division of Computing and Communication Foundations"},{"id":"https://openalex.org/G3688436805","display_name":null,"funder_award_id":"1559657","funder_id":"https://openalex.org/F4320337389","funder_display_name":"Division of Information and Intelligent Systems"},{"id":"https://openalex.org/G4839240699","display_name":null,"funder_award_id":"1560526","funder_id":"https://openalex.org/F4320337387","funder_display_name":"Division of Computing and Communication Foundations"},{"id":"https://openalex.org/G7403957188","display_name":null,"funder_award_id":"1439957","funder_id":"https://openalex.org/F4320337387","funder_display_name":"Division of Computing and Communication Foundations"}],"funders":[{"id":"https://openalex.org/F4320337387","display_name":"Division of Computing and Communication Foundations","ror":"https://ror.org/01mng8331"},{"id":"https://openalex.org/F4320337389","display_name":"Division of Information and Intelligent Systems","ror":"https://ror.org/053a2cp42"}],"has_content":{"grobid_xml":false,"pdf":false},"content_urls":null,"referenced_works_count":85,"referenced_works":["https://openalex.org/W95184617","https://openalex.org/W137385356","https://openalex.org/W397180395","https://openalex.org/W1589275176","https://openalex.org/W1592048085","https://openalex.org/W1592081868","https://openalex.org/W1595267443","https://openalex.org/W1780778418","https://openalex.org/W1873022895","https://openalex.org/W1964962870","https://openalex.org/W1970095746","https://openalex.org/W1971741152","https://openalex.org/W1972503075","https://openalex.org/W1981425990","https://openalex.org/W1985896931","https://openalex.org/W1986466161","https://openalex.org/W1989498066","https://openalex.org/W1995935241","https://openalex.org/W1995969252","https://openalex.org/W2003084112","https://openalex.org/W2007267771","https://openalex.org/W2019246026","https://openalex.org/W2019817607","https://openalex.org/W2028168446","https://openalex.org/W2036332715","https://openalex.org/W2036625316","https://openalex.org/W2040577374","https://openalex.org/W2049134176","https://openalex.org/W2057114491","https://openalex.org/W2065575115","https://openalex.org/W2072653937","https://openalex.org/W2075382909","https://openalex.org/W2080534028","https://openalex.org/W2081435073","https://openalex.org/W2081653557","https://openalex.org/W2081733930","https://openalex.org/W2088946319","https://openalex.org/W2089133913","https://openalex.org/W2094944943","https://openalex.org/W2096800101","https://openalex.org/W2097985262","https://openalex.org/W2099942748","https://openalex.org/W2100894766","https://openalex.org/W2103562041","https://openalex.org/W2109125971","https://openalex.org/W2116821290","https://openalex.org/W2117329005","https://openalex.org/W2121668868","https://openalex.org/W2123230287","https://openalex.org/W2123802152","https://openalex.org/W2125083169","https://openalex.org/W2125470981","https://openalex.org/W2133674686","https://openalex.org/W2133970835","https://openalex.org/W2136988678","https://openalex.org/W2141051748","https://openalex.org/W2141830387","https://openalex.org/W2143600439","https://openalex.org/W2144160189","https://openalex.org/W2146648240","https://openalex.org/W2147417089","https://openalex.org/W2148025389","https://openalex.org/W2148576927","https://openalex.org/W2156312482","https://openalex.org/W2160701576","https://openalex.org/W2160715838","https://openalex.org/W2161835696","https://openalex.org/W2167626029","https://openalex.org/W2395560004","https://openalex.org/W2396912093","https://openalex.org/W2521181501","https://openalex.org/W2529452704","https://openalex.org/W2548378638","https://openalex.org/W2552196466","https://openalex.org/W2594876878","https://openalex.org/W2611886336","https://openalex.org/W2624900765","https://openalex.org/W2767854151","https://openalex.org/W2776762819","https://openalex.org/W2883343426","https://openalex.org/W3146893295","https://openalex.org/W4229496713","https://openalex.org/W4241491750","https://openalex.org/W4248331228","https://openalex.org/W4256424646"],"related_works":["https://openalex.org/W2072806201","https://openalex.org/W2024218563","https://openalex.org/W1517743118","https://openalex.org/W1498173874","https://openalex.org/W2889038492","https://openalex.org/W1516169988","https://openalex.org/W2365711986","https://openalex.org/W2369673098","https://openalex.org/W2965845133","https://openalex.org/W4385154318"],"abstract_inverted_index":null,"counts_by_year":[{"year":2025,"cited_by_count":5},{"year":2024,"cited_by_count":5},{"year":2023,"cited_by_count":8},{"year":2022,"cited_by_count":5},{"year":2021,"cited_by_count":7},{"year":2020,"cited_by_count":6},{"year":2019,"cited_by_count":1}],"updated_date":"2026-04-09T08:11:56.329763","created_date":"2025-10-10T00:00:00"}