ConflictPatterns < SPG

SPG Web>SoftwareProductivityGroup>GenteAreaPublications>ConflictPatterns (2018-09-16, PaolaAccioly) (raw view)

---+ Understanding Merge Conflicts Characteristics (Website under construction)
---++ Abstract

Previous studies show that merge conflicts frequently occur in collaborative <span style="background-color: transparent;">development environments, and often impairs </span><span style="background-color: transparent;">developers' productivity, since merging contributions is a demanding and </span><span style="background-color: transparent;">tedious task. However, the structure of the changes that lead to </span><span style="background-color: transparent;">conflicts has not been studied yet. Understanding conflicts underlying structure </span><span style="background-color: transparent;">and the involved syntactic language elements might shed light on how to better </span><span style="background-color: transparent;">avoid and resolve conflicts. So, in this paper we derive a catalog of </span><span style="background-color: transparent;">conflict patterns expressed in terms of code changes that lead to conflicts. </span><span style="background-color: transparent;">To assess the occurrence of such patterns in open-source systems, we </span><span style="background-color: transparent;">conducted an empirical study that reproduces 56819 merges from </span><span style="background-color: transparent;">128 GitHub projects. We focus on conflicts reported by a </span><span style="background-color: transparent;">semistructured merge tool, avoiding a large number of spurious conflicts often </span><span style="background-color: transparent;">reported by typical unstructured tools that are still used in practice. We </span><span style="background-color: transparent;">found out that most merge conflicts happen because developers independently </span><span style="background-color: transparent;">edit the same lines of the same methods. Furthermore, we noticed that copying </span><span style="background-color: transparent;">and pasting pieces of code, or even entire files, across different repositories </span><span style="background-color: transparent;">is a common practice. We also analyze how our results reveal the need for new </span><span style="background-color: transparent;">research studies and potential improvements to tools that better support </span><span style="background-color: transparent;">collaborative software development.</span>

If you have any questions please contact:

Paola Accioly - prga at cin.ufpe.br

Paulo Borba - phmb at cin.ufpe.br

Guilherme Cavalcanti - gjcc at cin.ufpe.br
---++ Paper

[[http://twiki.cin.ufpe.br/twiki/pub/SPG/ConflictPatterns/ese.pdf][Link to our paper]]

<span style="background-color: transparent;">This is a post-peer-review, pre-copyedit version of an article published in The Empirical Software Engineering Journal. The final authenticated version is available online at: https://doi.org/10.1007/s10664-017-9586-1</span>

<span style="background-color: transparent;"><br /></span>
---+ Results -- Graphs and Tables (HTML generated by our R scripts)

[[https://prga.github.io/conflictPatternResults/][Conflict Pattern Results Here]]

[[https://www.dropbox.com/sh/lmij8lxmp9qow8w/AAAfLU2MqU3oXrVNvDDXqkiDa?dl=0][Normalized Conflict Results Here]]

---+ Data

All data we collected during our experiment is available in what follows.

<span style="background-color: transparent;"><span style="background-color: transparent;">[[https://dl.dropboxusercontent.com/u/10804483/ResultData.zip][Conflict Patterns collected]]</span></span>

<span style="background-color: transparent;"><span style="background-color: transparent;">[[https://www.dropbox.com/sh/lmij8lxmp9qow8w/AAAfLU2MqU3oXrVNvDDXqkiDa?dl=0][Normalized Patterns collected]]<br /></span></span>

---+ Tools

The tools used to run our experiment, including the mining and the execution step are available [[https://github.com/prga/conflictsAnalyzer][here]].

---+ Sample Systems

[[http://twiki.cin.ufpe.br/twiki/bin/view/SPG/SampleSystems][Description of our sample]]

---+ The Conflict Pattern Catalog

Bellow you can see one example of an instance of each pattern.
---++++ Different edits to the same area of the same method or constructor

Acronym: EditSameMC

Example:

<img width="703" alt="" src="%ATTACHURL%/LineBasedMCFd.png" height="211" />

---++++ Methods or constructors added with the same signature and different bodies

Acronym: SameSignatureCM

Example:

<img width="676" alt="" src="%ATTACHURL%/SameSignatureCM.png" height="322" />
---++++ Different edits to the same field declaration

Acronym: EditSameFd

Example:

<img width="575" alt="EditSameFd.png" src="http://twiki.cin.ufpe.br/twiki/pub/SPG/ConflictPatterns/EditSameFd.png" title="EditSameFd.png" height="211" />
---++++ Field declarations added with the same identifiers and different types of modifiers

Acronym: <span style="color: #0000ff;"><span style="text-decoration: underline;">AddSameFd</span></span>

Example:

<img width="511" alt="SameIdFd.png" src="http://twiki.cin.ufpe.br/twiki/pub/SPG/ConflictPatterns/SameIdFd.png" title="SameIdFd.png" height="204" />

---++++ Different edits to the modifier list of the same type declaration (class, interface, annotation or enum types)

Acronym: ModifierList

Example:

<img width="502" alt="ModifierList.png" src="http://twiki.cin.ufpe.br/twiki/pub/SPG/ConflictPatterns/ModifierList.png" title="ModifierList.png" height="157" />
---++++ Different edits to the same implements declaration

Acronym: ImplementsList

Example:

<img width="713" alt="" src="%ATTACHURL%/ImplementList.png" height="208" />
---++++ Different edits to the same extends declaration

Acronym: ExtendsList

Example:

<img width="803" alt="ExtendsLits.png" src="http://twiki.cin.ufpe.br/twiki/pub/SPG/ConflictPatterns/ExtendsLits.png" title="ExtendsLits.png" height="211" />
---++++ Different edits to the same annotation method default value

<span style="background-color: transparent;">Acronym: </span><span style="background-color: transparent;">DefaultValueA</span>

Example:

<img width="993" alt="" src="%ATTACHURL%/DefaultValueAnnotation.png" height="191" />

---+ Sample systems

MyForm
29 Jan.	EMN/ARMINES, ULANC, UMA, FCT/UNL
12 Feb.	HOLOS, EMN/ARMINES
26 Feb.

Attachments

Topic attachments
I	Attachment	Action	Size	Date	Who
png	DefaultValueAnnotation.png	manage	92.6 K	2014-12-11 - 21:22	UnknownUser
png	EditSameFd.png	manage	51.9 K	2015-08-30 - 16:27	UnknownUser
png	ExtendsLits.png	manage	63.4 K	2015-08-30 - 16:27	UnknownUser
png	ImplementList.png	manage	59.9 K	2014-12-11 - 21:04	UnknownUser
png	LineBasedMCFd.png	manage	69.4 K	2014-12-11 - 19:57	UnknownUser
png	ModifierList.png	manage	35.4 K	2014-12-11 - 20:57	UnknownUser
pdf	PID3558029.pdf	manage	89.7 K	2015-04-07 - 11:39	UnknownUser
png	SameIdFd.png	manage	51.3 K	2014-12-11 - 20:52	UnknownUser
png	SameSignatureCM.png	manage	97.6 K	2014-12-11 - 20:43	UnknownUser
html	conflictResults.html	manage	81.7 K	2016-10-19 - 17:18	UnknownUser
pdf	ese.pdf	manage	832.3 K	2017-12-26 - 14:59	UnknownUser
pdf	prga_icse_src.pdf	manage	85.6 K	2015-05-07 - 00:38	UnknownUser

Topic revision: r20 - 2018-09-16 - PaolaAccioly