{"id":"https://openalex.org/W2038013574","doi":"https://doi.org/10.1109/swan.2015.7070484","title":"How we resolve conflict: an empirical study of method-level conflict resolution","display_name":"How we resolve conflict: an empirical study of method-level conflict resolution","publication_year":2015,"publication_date":"2015-03-01","ids":{"openalex":"https://openalex.org/W2038013574","doi":"https://doi.org/10.1109/swan.2015.7070484","mag":"2038013574"},"language":"en","primary_location":{"id":"doi:10.1109/swan.2015.7070484","is_oa":false,"landing_page_url":"https://doi.org/10.1109/swan.2015.7070484","pdf_url":null,"source":null,"license":null,"license_id":null,"version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"2015 IEEE 1st International Workshop on Software Analytics (SWAN)","raw_type":"proceedings-article"},"type":"conference-paper","indexed_in":["crossref"],"open_access":{"is_oa":true,"oa_status":"green","oa_url":"https://naist.repo.nii.ac.jp/records/5131","any_repository_has_fulltext":true},"authorships":[{"author_position":"first","author":{"id":"https://openalex.org/A5086569440","display_name":"Ryohei Yuzuki","orcid":null},"institutions":[{"id":"https://openalex.org/I75917431","display_name":"Nara Institute of Science and Technology","ror":"https://ror.org/05bhada84","country_code":"JP","type":"education","lineage":["https://openalex.org/I75917431"]}],"countries":["JP"],"is_corresponding":false,"raw_author_name":"Ryohei Yuzuki","raw_affiliation_strings":["Graduate School of Information Science, Nara Institute of Science and Technology, Japan","Graduate Sch. of Inf. Sci., Nara Inst. of Sci. & Technol., Japan"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"Graduate School of Information Science, Nara Institute of Science and Technology, Japan","institution_ids":["https://openalex.org/I75917431"]},{"raw_affiliation_string":"Graduate Sch. of Inf. Sci., Nara Inst. of Sci. & Technol., Japan","institution_ids":["https://openalex.org/I75917431"]}]},{"author_position":"middle","author":{"id":"https://openalex.org/A5020711309","display_name":"Hideaki Hata","orcid":"https://orcid.org/0000-0003-0708-5222"},"institutions":[{"id":"https://openalex.org/I75917431","display_name":"Nara Institute of Science and Technology","ror":"https://ror.org/05bhada84","country_code":"JP","type":"education","lineage":["https://openalex.org/I75917431"]}],"countries":["JP"],"is_corresponding":false,"raw_author_name":"Hideaki Hata","raw_affiliation_strings":["Graduate School of Information Science, Nara Institute of Science and Technology, Japan","Graduate Sch. of Inf. Sci., Nara Inst. of Sci. & Technol., Japan"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"Graduate School of Information Science, Nara Institute of Science and Technology, Japan","institution_ids":["https://openalex.org/I75917431"]},{"raw_affiliation_string":"Graduate Sch. of Inf. Sci., Nara Inst. of Sci. & Technol., Japan","institution_ids":["https://openalex.org/I75917431"]}]},{"author_position":"last","author":{"id":"https://openalex.org/A5011588138","display_name":"Kenichi Matsumoto","orcid":"https://orcid.org/0000-0002-7418-9323"},"institutions":[{"id":"https://openalex.org/I75917431","display_name":"Nara Institute of Science and Technology","ror":"https://ror.org/05bhada84","country_code":"JP","type":"education","lineage":["https://openalex.org/I75917431"]}],"countries":["JP"],"is_corresponding":false,"raw_author_name":"Kenichi Matsumoto","raw_affiliation_strings":["Graduate School of Information Science, Nara Institute of Science and Technology, Japan","Graduate Sch. of Inf. Sci., Nara Inst. of Sci. & Technol., Japan"],"raw_orcid":null,"affiliations":[{"raw_affiliation_string":"Graduate School of Information Science, Nara Institute of Science and Technology, Japan","institution_ids":["https://openalex.org/I75917431"]},{"raw_affiliation_string":"Graduate Sch. of Inf. Sci., Nara Inst. of Sci. & Technol., Japan","institution_ids":["https://openalex.org/I75917431"]}]}],"institutions":[],"countries_distinct_count":1,"institutions_distinct_count":1,"corresponding_author_ids":[],"corresponding_institution_ids":["https://openalex.org/I75917431"],"apc_list":null,"apc_paid":null,"fwci":0.5792,"has_fulltext":false,"cited_by_count":16,"citation_normalized_percentile":{"value":0.62899302,"is_in_top_1_percent":false,"is_in_top_10_percent":false},"cited_by_percentile_year":{"min":90,"max":97},"biblio":{"volume":null,"issue":null,"first_page":"21","last_page":"24"},"is_retracted":false,"is_paratext":false,"is_xpac":false,"primary_topic":{"id":"https://openalex.org/T10260","display_name":"Software Engineering Research","score":1.0,"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":1.0,"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/T10743","display_name":"Software Testing and Debugging Techniques","score":0.9998000264167786,"subfield":{"id":"https://openalex.org/subfields/1712","display_name":"Software"},"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/T12423","display_name":"Software Reliability and Analysis Research","score":0.9997000098228455,"subfield":{"id":"https://openalex.org/subfields/1712","display_name":"Software"},"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/conflict-resolution","display_name":"Conflict resolution","score":0.8428030014038086},{"id":"https://openalex.org/keywords/computer-science","display_name":"Computer science","score":0.6562160849571228},{"id":"https://openalex.org/keywords/context","display_name":"Context (archaeology)","score":0.580263078212738},{"id":"https://openalex.org/keywords/conflict-analysis","display_name":"Conflict analysis","score":0.5346381664276123},{"id":"https://openalex.org/keywords/java","display_name":"Java","score":0.5259378552436829},{"id":"https://openalex.org/keywords/scale","display_name":"Scale (ratio)","score":0.5039178729057312},{"id":"https://openalex.org/keywords/resolution","display_name":"Resolution (logic)","score":0.49831390380859375},{"id":"https://openalex.org/keywords/branching","display_name":"Branching (polymer chemistry)","score":0.4975145161151886},{"id":"https://openalex.org/keywords/software","display_name":"Software","score":0.4311041831970215},{"id":"https://openalex.org/keywords/data-science","display_name":"Data science","score":0.41990578174591064},{"id":"https://openalex.org/keywords/conflict-management","display_name":"Conflict management","score":0.41988465189933777},{"id":"https://openalex.org/keywords/knowledge-management","display_name":"Knowledge management","score":0.32005542516708374},{"id":"https://openalex.org/keywords/political-science","display_name":"Political science","score":0.2532235383987427},{"id":"https://openalex.org/keywords/artificial-intelligence","display_name":"Artificial intelligence","score":0.14761576056480408},{"id":"https://openalex.org/keywords/geography","display_name":"Geography","score":0.13255172967910767},{"id":"https://openalex.org/keywords/programming-language","display_name":"Programming language","score":0.11094510555267334}],"concepts":[{"id":"https://openalex.org/C21711469","wikidata":"https://www.wikidata.org/wiki/Q1194317","display_name":"Conflict resolution","level":2,"score":0.8428030014038086},{"id":"https://openalex.org/C41008148","wikidata":"https://www.wikidata.org/wiki/Q21198","display_name":"Computer science","level":0,"score":0.6562160849571228},{"id":"https://openalex.org/C2779343474","wikidata":"https://www.wikidata.org/wiki/Q3109175","display_name":"Context (archaeology)","level":2,"score":0.580263078212738},{"id":"https://openalex.org/C138232368","wikidata":"https://www.wikidata.org/wiki/Q5160175","display_name":"Conflict analysis","level":3,"score":0.5346381664276123},{"id":"https://openalex.org/C548217200","wikidata":"https://www.wikidata.org/wiki/Q251","display_name":"Java","level":2,"score":0.5259378552436829},{"id":"https://openalex.org/C2778755073","wikidata":"https://www.wikidata.org/wiki/Q10858537","display_name":"Scale (ratio)","level":2,"score":0.5039178729057312},{"id":"https://openalex.org/C138268822","wikidata":"https://www.wikidata.org/wiki/Q1051925","display_name":"Resolution (logic)","level":2,"score":0.49831390380859375},{"id":"https://openalex.org/C206175624","wikidata":"https://www.wikidata.org/wiki/Q595731","display_name":"Branching (polymer chemistry)","level":2,"score":0.4975145161151886},{"id":"https://openalex.org/C2777904410","wikidata":"https://www.wikidata.org/wiki/Q7397","display_name":"Software","level":2,"score":0.4311041831970215},{"id":"https://openalex.org/C2522767166","wikidata":"https://www.wikidata.org/wiki/Q2374463","display_name":"Data science","level":1,"score":0.41990578174591064},{"id":"https://openalex.org/C2779683958","wikidata":"https://www.wikidata.org/wiki/Q1640893","display_name":"Conflict management","level":2,"score":0.41988465189933777},{"id":"https://openalex.org/C56739046","wikidata":"https://www.wikidata.org/wiki/Q192060","display_name":"Knowledge management","level":1,"score":0.32005542516708374},{"id":"https://openalex.org/C17744445","wikidata":"https://www.wikidata.org/wiki/Q36442","display_name":"Political science","level":0,"score":0.2532235383987427},{"id":"https://openalex.org/C154945302","wikidata":"https://www.wikidata.org/wiki/Q11660","display_name":"Artificial intelligence","level":1,"score":0.14761576056480408},{"id":"https://openalex.org/C205649164","wikidata":"https://www.wikidata.org/wiki/Q1071","display_name":"Geography","level":0,"score":0.13255172967910767},{"id":"https://openalex.org/C199360897","wikidata":"https://www.wikidata.org/wiki/Q9143","display_name":"Programming language","level":1,"score":0.11094510555267334},{"id":"https://openalex.org/C58640448","wikidata":"https://www.wikidata.org/wiki/Q42515","display_name":"Cartography","level":1,"score":0.0},{"id":"https://openalex.org/C166957645","wikidata":"https://www.wikidata.org/wiki/Q23498","display_name":"Archaeology","level":1,"score":0.0},{"id":"https://openalex.org/C199539241","wikidata":"https://www.wikidata.org/wiki/Q7748","display_name":"Law","level":1,"score":0.0},{"id":"https://openalex.org/C192562407","wikidata":"https://www.wikidata.org/wiki/Q228736","display_name":"Materials science","level":0,"score":0.0},{"id":"https://openalex.org/C159985019","wikidata":"https://www.wikidata.org/wiki/Q181790","display_name":"Composite material","level":1,"score":0.0}],"mesh":[],"locations_count":3,"locations":[{"id":"doi:10.1109/swan.2015.7070484","is_oa":false,"landing_page_url":"https://doi.org/10.1109/swan.2015.7070484","pdf_url":null,"source":null,"license":null,"license_id":null,"version":"publishedVersion","is_accepted":true,"is_published":true,"raw_source_name":"2015 IEEE 1st International Workshop on Software Analytics (SWAN)","raw_type":"proceedings-article"},{"id":"pmh:oai:irdb.nii.ac.jp:01146:0005783582","is_oa":true,"landing_page_url":"https://naist.repo.nii.ac.jp/records/5131","pdf_url":null,"source":{"id":"https://openalex.org/S7407056385","display_name":"Institutional Repositories DataBase (IRDB)","issn_l":null,"issn":null,"is_oa":false,"is_in_doaj":false,"is_core":false,"host_organization":"https://openalex.org/I184597095","host_organization_name":"National Institute of Informatics","host_organization_lineage":["https://openalex.org/I184597095"],"host_organization_lineage_names":[],"type":"repository"},"license":null,"license_id":null,"version":"acceptedVersion","is_accepted":true,"is_published":false,"raw_source_name":null,"raw_type":"conference paper"},{"id":"pmh:oai:library.naist.jp:10061/12738","is_oa":true,"landing_page_url":"http://hdl.handle.net/10061/12738","pdf_url":null,"source":{"id":"https://openalex.org/S4377196843","display_name":"NAIST Digital Library (Nara Institute of Science and Technology)","issn_l":null,"issn":null,"is_oa":false,"is_in_doaj":false,"is_core":false,"host_organization":"https://openalex.org/I75917431","host_organization_name":"Nara Institute of Science and Technology","host_organization_lineage":["https://openalex.org/I75917431"],"host_organization_lineage_names":[],"type":"repository"},"license":"cc-by-nc-nd","license_id":"https://openalex.org/licenses/cc-by-nc-nd","version":"submittedVersion","is_accepted":false,"is_published":false,"raw_source_name":"","raw_type":"Conference Paper"}],"best_oa_location":{"id":"pmh:oai:irdb.nii.ac.jp:01146:0005783582","is_oa":true,"landing_page_url":"https://naist.repo.nii.ac.jp/records/5131","pdf_url":null,"source":{"id":"https://openalex.org/S7407056385","display_name":"Institutional Repositories DataBase (IRDB)","issn_l":null,"issn":null,"is_oa":false,"is_in_doaj":false,"is_core":false,"host_organization":"https://openalex.org/I184597095","host_organization_name":"National Institute of Informatics","host_organization_lineage":["https://openalex.org/I184597095"],"host_organization_lineage_names":[],"type":"repository"},"license":null,"license_id":null,"version":"acceptedVersion","is_accepted":true,"is_published":false,"raw_source_name":null,"raw_type":"conference paper"},"sustainable_development_goals":[{"score":0.4699999988079071,"display_name":"Partnerships for the goals","id":"https://metadata.un.org/sdg/17"}],"awards":[{"id":"https://openalex.org/G7339016638","display_name":"Furinkazan: Understanding Behaviors in Software Development based on Game Theoretical Modeling and Empirical Studies","funder_award_id":"26540029","funder_id":"https://openalex.org/F4320334764","funder_display_name":"Japan Society for the Promotion of Science"}],"funders":[{"id":"https://openalex.org/F4320334764","display_name":"Japan Society for the Promotion of Science","ror":"https://ror.org/00hhkn466"}],"has_content":{"pdf":false,"grobid_xml":false},"content_urls":null,"referenced_works_count":15,"referenced_works":["https://openalex.org/W1979496811","https://openalex.org/W2004012461","https://openalex.org/W2007267771","https://openalex.org/W2017453330","https://openalex.org/W2036125455","https://openalex.org/W2049134176","https://openalex.org/W2076719273","https://openalex.org/W2088946319","https://openalex.org/W2113371678","https://openalex.org/W2121668868","https://openalex.org/W2122947685","https://openalex.org/W2145124323","https://openalex.org/W4231241365","https://openalex.org/W4250151231","https://openalex.org/W4255632703"],"related_works":["https://openalex.org/W608439689","https://openalex.org/W2603100771","https://openalex.org/W2970559006","https://openalex.org/W2075118017","https://openalex.org/W2040378075","https://openalex.org/W2780446852","https://openalex.org/W4299378847","https://openalex.org/W605434451","https://openalex.org/W3153366358","https://openalex.org/W396828089"],"abstract_inverted_index":{"Context:":[0],"Branching":[1],"and":[2,95,143],"merging":[3],"are":[4,66,81,121,133,139,150,165],"common":[5,50],"activities":[6],"in":[7,42,57,73,83,99,111],"large-scale":[8,86],"software":[9],"development":[10,13],"projects.":[11],"Isolated":[12],"with":[14],"branching":[15],"enables":[16],"developers":[17,59],"to":[18,61,77],"focus":[19],"their":[20,23],"effort":[21],"on":[22,29],"specific":[24],"tasks":[25,41],"without":[26],"wasting":[27],"time":[28],"the":[30,38,63,104,126],"problems":[31],"caused":[32,122],"by":[33,52,123,134,140,152,167],"other":[34],"developers'":[35],"changes.":[36],"After":[37],"completion":[39],"of":[40,106,119,129,148,163,171],"branches,":[43],"such":[44],"branches":[45,51],"should":[46],"be":[47],"integrated":[48],"into":[49],"merging.":[53],"When":[54],"conflicts":[55,80,94,120,149,164],"occur":[56],"merging,":[58,74],"need":[60],"resolve":[62],"conflicts,":[64],"which":[65],"troublesome.":[67],"Goal:":[68],"To":[69],"support":[70],"conflict":[71,97,180],"resolution":[72,98],"we":[75,113],"aim":[76],"understand":[78],"how":[79],"resolved":[82,151,166],"practice":[84],"from":[85],"study.":[87],"Method:":[88],"We":[89],"present":[90],"techniques":[91],"for":[92,178],"identifying":[93],"detecting":[96],"method":[100,155],"level.":[101],"Result:":[102],"From":[103],"analysis":[105],"10":[107],"OSS":[108],"projects":[109],"written":[110],"Java,":[112],"found":[114],"that":[115,144,161],"(1)":[116],"44%":[117],"(339/779)":[118],"changing":[124],"concurrently":[125],"same":[127],"positions":[128],"methods,":[130,136,142],"48%":[131],"(375/779)":[132],"deleting":[135],"8%":[137],"(65/779)":[138],"renaming":[141],"(2)":[145],"99%":[146],"(771/779)":[147],"adopting":[153],"one":[154],"directly.":[156],"Conclusions:":[157],"Our":[158],"results":[159],"suggest":[160],"most":[162],"simple":[168],"way.":[169],"One":[170],"our":[172],"future":[173],"works":[174],"is":[175],"developing":[176],"methods":[177],"supporting":[179],"resolution.":[181]},"counts_by_year":[{"year":2025,"cited_by_count":1},{"year":2024,"cited_by_count":3},{"year":2023,"cited_by_count":1},{"year":2022,"cited_by_count":3},{"year":2021,"cited_by_count":2},{"year":2020,"cited_by_count":2},{"year":2019,"cited_by_count":2},{"year":2018,"cited_by_count":1},{"year":2016,"cited_by_count":1}],"updated_date":"2026-07-29T14:22:42.915294","created_date":"2025-10-10T00:00:00"}