Difference: ConflictPatterns (1 vs. 20)

Revision 202018-09-16 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Merge Conflicts Characteristics (Website under construction)

Abstract

Line: 23 to 23
  Conflict Pattern Results Here
Changed:
<
<		Normalized Conflict Results Here
>
>		Normalized Conflict Results Here
 

Data

Line: 31 to 31
  Conflict Patterns collected
Changed:
<
<		Normalized Patterns collected
>
>		Normalized Patterns collected
 

Tools

Revision 192017-12-26 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Merge Conflicts Characteristics (Website under construction)

Abstract

Line: 14 to 14
 Guilherme Cavalcanti - gjcc at cin.ufpe.br

Paper

Changed:
<
<		Link to our paper
>
>		Link to our paper
 
Added:
>
>		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


 

Results -- Graphs and Tables (HTML generated by our R scripts)

Conflict Pattern Results Here

Line: 117 to 120
 
META FILEATTACHMENT attachment="EditSameFd.png" attr="" comment="" date="1440952034" name="EditSameFd.png" path="EditSameFd.png" size="53125" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="ExtendsLits.png" attr="" comment="" date="1440952052" name="ExtendsLits.png" path="ExtendsLits.png" size="64937" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="conflictResults.html" attr="" comment="" date="1476897535" name="conflictResults.html" path="conflictResults.html" size="83613" user="PaolaAccioly" version="1"
Changed:
<
<
META FILEATTACHMENT attachment="emse.pdf" attr="" comment="" date="1513952008" name="emse.pdf" path="emse.pdf" size="1522246" user="PaolaAccioly" version="1"
>
>
META FILEATTACHMENT attachment="ese.pdf" attr="" comment="" date="1514300355" name="ese.pdf" path="ese.pdf" size="852276" user="PaolaAccioly" version="1"

Revision 182017-12-22 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Merge Conflicts Characteristics (Website under construction)

Abstract

Line: 12 to 12
 Paulo Borba - phmb at cin.ufpe.br

Guilherme Cavalcanti - gjcc at cin.ufpe.br

Added:
>
>

Paper

Link to our paper

 

Results -- Graphs and Tables (HTML generated by our R scripts)

Line: 114 to 117
 
META FILEATTACHMENT attachment="EditSameFd.png" attr="" comment="" date="1440952034" name="EditSameFd.png" path="EditSameFd.png" size="53125" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="ExtendsLits.png" attr="" comment="" date="1440952052" name="ExtendsLits.png" path="ExtendsLits.png" size="64937" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="conflictResults.html" attr="" comment="" date="1476897535" name="conflictResults.html" path="conflictResults.html" size="83613" user="PaolaAccioly" version="1"
Added:
>
>
META FILEATTACHMENT attachment="emse.pdf" attr="" comment="" date="1513952008" name="emse.pdf" path="emse.pdf" size="1522246" user="PaolaAccioly" version="1"

Revision 172016-10-19 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Merge Conflicts Characteristics (Website under construction)

Abstract

Line: 15 to 15
 

Results -- Graphs and Tables (HTML generated by our R scripts)

Changed:
<
<		Conflict Pattern Results Here
>
>		Conflict Pattern Results Here
  Normalized Conflict Results Here
Line: 113 to 113
 
META FILEATTACHMENT attachment="prga_icse_src.pdf" attr="" comment="" date="1430959095" name="prga_icse_src.pdf" path="prga_icse_src.pdf" size="87612" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="EditSameFd.png" attr="" comment="" date="1440952034" name="EditSameFd.png" path="EditSameFd.png" size="53125" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="ExtendsLits.png" attr="" comment="" date="1440952052" name="ExtendsLits.png" path="ExtendsLits.png" size="64937" user="PaolaAccioly" version="1"
Added:
>
>
META FILEATTACHMENT attachment="conflictResults.html" attr="" comment="" date="1476897535" name="conflictResults.html" path="conflictResults.html" size="83613" user="PaolaAccioly" version="1"

Revision 162016-03-16 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Merge Conflicts Characteristics (Website under construction)

Abstract

Line: 25 to 25
  Conflict Patterns collected
Changed:
<
<		[[https://dl.dropboxusercontent.com/u/10804483/normalization/projectsChanges.csv[Normalized Patterns collected]]
>
>		Normalized Patterns collected
 

Tools

Revision 152016-03-16 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Merge Conflicts Characteristics (Website under construction)

Abstract

Revision 142016-03-16 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Merge Conflicts Characteristics (Website under construction)

Abstract

Line: 15 to 15
 

Results -- Graphs and Tables (HTML generated by our R scripts)

Changed:
<
<		Updated Results Here
>
>		Conflict Pattern Results Here

Normalized Conflict Results Here

 

Data

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

Changed:
<
<		Results collected
>
>		Conflict Patterns collected

[[https://dl.dropboxusercontent.com/u/10804483/normalization/projectsChanges.csv[Normalized Patterns collected]]

 

Tools

Revision 132015-11-13 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Merge Conflicts Characteristics (Website under construction)

Abstract

Line: 21 to 21
  All data we collected during our experiment is available in what follows.
Changed:
<
<		Results collected
>
>		Results collected
 

Tools

Revision 122015-09-08 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Merge Conflicts Characteristics (Website under construction)

Abstract

Line: 13 to 13
  Guilherme Cavalcanti - gjcc at cin.ufpe.br
Changed:
<
<

Results -- Graphs and Tables

>
>

Results -- Graphs and Tables (HTML generated by our R scripts)

  Updated Results Here

Revision 112015-09-02 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Merge Conflicts Characteristics (Website under construction)

Abstract

Line: 25 to 25
 

Tools

Changed:
<
<		The tools used to run our experiment, including the mining and the execution step is available here.
>
>		The tools used to run our experiment, including the mining and the execution step are available here.
 

Sample Systems

Revision 102015-09-02 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Merge Conflicts Characteristics (Website under construction)

Abstract

Line: 27 to 27
  The tools used to run our experiment, including the mining and the execution step is available here.
Added:
>
>

Sample Systems

Description of our sample

 

The Conflict Pattern Catalog

Bellow you can see one example of an instance of each pattern.

Revision 92015-09-02 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Merge Conflicts Characteristics (Website under construction)

Added:
>
>

Abstract

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

Update Results Link

>
>

Results -- Graphs and Tables

  Updated Results Here
Added:
>
>

Data

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

Results collected

Tools

The tools used to run our experiment, including the mining and the execution step is available here.

 

The Conflict Pattern Catalog

Bellow you can see one example of an instance of each pattern.

Line: 40 to 51
  Example:
Changed:
<
<		EditSameFd.png
>
>		EditSameFd.png
 

Field declarations added with the same identifiers and different types of modifiers

Acronym: AddSameFd

Line: 69 to 80
  Example:
Changed:
<
<		ExtendsLits.png
>
>		ExtendsLits.png
 

Different edits to the same annotation method default value

Acronym: DefaultValueA

Line: 78 to 89
 
Changed:
<
<

Tools

The source code for our tools is available here.

>
>

Sample systems

 
META FORM name="MyForm"
FORM FIELD 29 Jan. 29Jan. EMN/ARMINES, ULANC, UMA, FCT/UNL

Revision 82015-08-30 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"
Changed:
<
<

Understanding Conflicts Arising from Collaborative Development (Website under construction)

>
>

Understanding Merge Conflicts Characteristics (Website under construction)

 
Changed:
<
<		When working in a collaborative development environment, developers implement different tasks in an independent way. Consequently, during the integration process, one might have to deal with conflicting changes. Previous studies indicate that conflicts occur frequently and impair developers’ productivity. Such evidence motivates the development of tools to avoid, detect and solve conflicts. However, despite the existing evidence about this problem, there are still questions left unanswered that could drive up the productivity of existing tools. The goals of this PhD research work is to investigate conflict characteristics through empirical studies and propose improved ways to better support software developers working collaboratively. In this webpage you will find all the description of our conflict pattern catalog, the tools used in the study and our updated results.
>
>		Previous studies show that merge conflicts frequently occur in collaborative development environments, and often impairs developers' productivity, since merging contributions is a demanding and tedious task. However, the structure of the changes that lead to conflicts has not been studied yet. Understanding conflicts underlying structure and the involved syntactic language elements might shed light on how to better avoid and resolve conflicts. So, in this paper we derive a catalog of conflict patterns expressed in terms of code changes that lead to conflicts. To assess the occurrence of such patterns in open-source systems, we conducted an empirical study that reproduces 56819 merges from 128 GitHub projects. We focus on conflicts reported by a semistructured merge tool, avoiding a large number of spurious conflicts often reported by typical unstructured tools that are still used in practice. We found out that most merge conflicts happen because developers independently edit the same lines of the same methods. Furthermore, we noticed that copying and pasting pieces of code, or even entire files, across different repositories is a common practice. We also analyze how our results reveal the need for new research studies and potential improvements to tools that better support collaborative software development.
 
Changed:
<
<		Paper Preprint

If you have any questions please contact me:

>
>		If you have any questions please contact:
  Paola Accioly - prga at cin.ufpe.br
Changed:
<
<

Results

>
>		Paulo Borba - phmb at cin.ufpe.br

Guilherme Cavalcanti - gjcc at cin.ufpe.br

Update Results Link

  Updated Results Here

The Conflict Pattern Catalog

Bellow you can see one example of an instance of each pattern.

Changed:
<
<

Pattern 1

Title: Make different edits (including removal) to the same area of the same method, constructor or field declaration.

>
>

Different edits to the same area of the same method or constructor

 
Changed:
<
<		Acronym: LineBasedMCFd
>
>		Acronym: EditSameMC
  Example:

Changed:
<
<

Pattern 2

Title: Add methods or constructors declarations with the same signature and different bodies.

>
>

Methods or constructors added with the same signature and different bodies

  Acronym: SameSignatureCM

Example:

Changed:
<
<

Pattern 3

>
>

Different edits to the same field declaration

Acronym: EditSameFd

Example:

 
Changed:
<
<		Title: Add field declarations with the same id and different types or modifiers.
>
>		EditSameFd.png

Field declarations added with the same identifiers and different types of modifiers

 
Changed:
<
<		Acronym: SameIdFd
>
>		Acronym: AddSameFd
  Example:

SameIdFd.png

Changed:
<
<

Pattern 4

Title: Make different edits (including removal) to the modifiers list of the same type declaration (class, interface, annotation or enum types).

>
>

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

  Acronym: ModifierList

Example:

ModifierList.png

Changed:
<
<

Pattern 5

Title: Make different edits (including removal) to the same list of implements declaration.

>
>

Different edits to the same implements declaration

 
Changed:
<
<		Acronym: ImplementList
>
>		Acronym: ImplementsList
  Example:

Changed:
<
<

Pattern 6

>
>

Different edits to the same extends declaration

 
Changed:
<
<		Title: Make different edits (including removal) to the default value of the same annotation method declaration.
>
>		Acronym: ExtendsList

Example:

 
Changed:
<
<		Acronym: DefaultValueAnnotation
>
>		ExtendsLits.png

Different edits to the same annotation method default value

Acronym: DefaultValueA

  Example:
Line: 76 to 80
 

Tools

Changed:
<
<		The source code for our tools is available here. We are currently working on a set of instructions to install and run our environment.

>
>		The source code for our tools is available here.
 
META FORM name="MyForm"
FORM FIELD 29 Jan. 29Jan. EMN/ARMINES, ULANC, UMA, FCT/UNL
Line: 94 to 94
 
META FILEATTACHMENT attachment="DefaultValueAnnotation.png" attr="" comment="" date="1418332926" name="DefaultValueAnnotation.png" path="DefaultValueAnnotation.png" size="94774" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="PID3558029.pdf" attr="" comment="" date="1428406798" name="PID3558029.pdf" path="PID3558029.pdf" size="91874" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="prga_icse_src.pdf" attr="" comment="" date="1430959095" name="prga_icse_src.pdf" path="prga_icse_src.pdf" size="87612" user="PaolaAccioly" version="1"
Added:
>
>
META FILEATTACHMENT attachment="EditSameFd.png" attr="" comment="" date="1440952034" name="EditSameFd.png" path="EditSameFd.png" size="53125" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="ExtendsLits.png" attr="" comment="" date="1440952052" name="ExtendsLits.png" path="ExtendsLits.png" size="64937" user="PaolaAccioly" version="1"

Revision 72015-05-07 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Conflicts Arising from Collaborative Development (Website under construction)

When working in a collaborative development environment, developers implement different tasks in an independent way. Consequently, during the integration process, one might have to deal with conflicting changes. Previous studies indicate that conflicts occur frequently and impair developers’ productivity. Such evidence motivates the development of tools to avoid, detect and solve conflicts. However, despite the existing evidence about this problem, there are still questions left unanswered that could drive up the productivity of existing tools. The goals of this PhD research work is to investigate conflict characteristics through empirical studies and propose improved ways to better support software developers working collaboratively. In this webpage you will find all the description of our conflict pattern catalog, the tools used in the study and our updated results.

Changed:
<
<		Paper Preprint
>
>		Paper Preprint
  If you have any questions please contact me:
Line: 93 to 93
 
META FILEATTACHMENT attachment="ImplementList.png" attr="" comment="" date="1418331869" name="ImplementList.png" path="ImplementList.png" size="61331" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="DefaultValueAnnotation.png" attr="" comment="" date="1418332926" name="DefaultValueAnnotation.png" path="DefaultValueAnnotation.png" size="94774" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="PID3558029.pdf" attr="" comment="" date="1428406798" name="PID3558029.pdf" path="PID3558029.pdf" size="91874" user="PaolaAccioly" version="1"
Added:
>
>
META FILEATTACHMENT attachment="prga_icse_src.pdf" attr="" comment="" date="1430959095" name="prga_icse_src.pdf" path="prga_icse_src.pdf" size="87612" user="PaolaAccioly" version="1"

Revision 62015-04-07 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Conflicts Arising from Collaborative Development (Website under construction)

When working in a collaborative development environment, developers implement different tasks in an independent way. Consequently, during the integration process, one might have to deal with conflicting changes. Previous studies indicate that conflicts occur frequently and impair developers’ productivity. Such evidence motivates the development of tools to avoid, detect and solve conflicts. However, despite the existing evidence about this problem, there are still questions left unanswered that could drive up the productivity of existing tools. The goals of this PhD research work is to investigate conflict characteristics through empirical studies and propose improved ways to better support software developers working collaboratively. In this webpage you will find all the description of our conflict pattern catalog, the tools used in the study and our updated results.

Added:
>
>		Paper Preprint
 If you have any questions please contact me:

Paola Accioly - prga at cin.ufpe.br

Line: 78 to 80
 

Added:
>
>
 
META FORM name="MyForm"
FORM FIELD 29 Jan. 29Jan. EMN/ARMINES, ULANC, UMA, FCT/UNL
FORM FIELD 12 Feb. 12Feb. HOLOS, EMN/ARMINES
Line: 88 to 92
 
META FILEATTACHMENT attachment="ModifierList.png" attr="" comment="" date="1418331452" name="ModifierList.png" path="ModifierList.png" size="36203" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="ImplementList.png" attr="" comment="" date="1418331869" name="ImplementList.png" path="ImplementList.png" size="61331" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="DefaultValueAnnotation.png" attr="" comment="" date="1418332926" name="DefaultValueAnnotation.png" path="DefaultValueAnnotation.png" size="94774" user="PaolaAccioly" version="1"
Added:
>
>
META FILEATTACHMENT attachment="PID3558029.pdf" attr="" comment="" date="1428406798" name="PID3558029.pdf" path="PID3558029.pdf" size="91874" user="PaolaAccioly" version="1"

Revision 52015-01-12 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Conflicts Arising from Collaborative Development (Website under construction)

Line: 8 to 8
  Paola Accioly - prga at cin.ufpe.br
Added:
>
>

Results

Updated Results Here

 

The Conflict Pattern Catalog

Bellow you can see one example of an instance of each pattern.

Line: 71 to 75
 

Tools

The source code for our tools is available here. We are currently working on a set of instructions to install and run our environment.

Deleted:
<
<

Results

 
Deleted:
<
<		Updated Results
 

META FORM name="MyForm"

Revision 42014-12-11 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"
Changed:
<
<

Understanding Conflicts Arising from Collaborative Development (Website under construction)

>
>

Understanding Conflicts Arising from Collaborative Development (Website under construction)

  When working in a collaborative development environment, developers implement different tasks in an independent way. Consequently, during the integration process, one might have to deal with conflicting changes. Previous studies indicate that conflicts occur frequently and impair developers’ productivity. Such evidence motivates the development of tools to avoid, detect and solve conflicts. However, despite the existing evidence about this problem, there are still questions left unanswered that could drive up the productivity of existing tools. The goals of this PhD research work is to investigate conflict characteristics through empirical studies and propose improved ways to better support software developers working collaboratively. In this webpage you will find all the description of our conflict pattern catalog, the tools used in the study and our updated results.
Changed:
<
<

The Conflict Pattern Catalog

  1. Make different edits (including removal) to the same area of the same method, constructor or field declaration;
  2. Add methods or constructors declarations with the same signature and different bodies;
  3. Add field declarations with the same id and different types or modifiers;
  4. Make different edits (including removal) to the modifiers list of the same type declaration (class, interface, annotation or enum types);
  5. Make different edits (including removal) to the same list of implements declaration;
  6. Make different edits (including removal) to the default value of the same annotation method declaration;
>
>		 If you have any questions please contact me:

Paola Accioly - prga at cin.ufpe.br

The Conflict Pattern Catalog

 Bellow you can see one example of an instance of each pattern.
Added:
>
>

Pattern 1

Title: Make different edits (including removal) to the same area of the same method, constructor or field declaration.

Acronym: LineBasedMCFd

Example:

Pattern 2

Title: Add methods or constructors declarations with the same signature and different bodies.

Acronym: SameSignatureCM

Example:

Pattern 3

Title: Add field declarations with the same id and different types or modifiers.

Acronym: SameIdFd

Example:

SameIdFd.png

Pattern 4

Title: Make different edits (including removal) to the modifiers list of the same type declaration (class, interface, annotation or enum types).

Acronym: ModifierList

Example:

ModifierList.png

Pattern 5

Title: Make different edits (including removal) to the same list of implements declaration.

Acronym: ImplementList

Example:

Pattern 6

Title: Make different edits (including removal) to the default value of the same annotation method declaration.

Acronym: DefaultValueAnnotation

Example:

Tools

 
Changed:
<
<

Results

>
>		The source code for our tools is available here. We are currently working on a set of instructions to install and run our environment.

Results

  Updated Results
Added:
>
>

 
META FORM name="MyForm"
FORM FIELD 29 Jan. 29Jan. EMN/ARMINES, ULANC, UMA, FCT/UNL
FORM FIELD 12 Feb. 12Feb. HOLOS, EMN/ARMINES
FORM FIELD 26 Feb. 26Feb.
Added:
>
>
META FILEATTACHMENT attachment="LineBasedMCFd.png" attr="" comment="" date="1418327851" name="LineBasedMCFd.png" path="LineBasedMCFd.png" size="71026" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="SameSignatureCM.png" attr="" comment="" date="1418330611" name="SameSignatureCM.png" path="SameSignatureCM.png" size="99941" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="SameIdFd.png" attr="" comment="" date="1418331149" name="SameIdFd.png" path="SameIdFd.png" size="52538" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="ModifierList.png" attr="" comment="" date="1418331452" name="ModifierList.png" path="ModifierList.png" size="36203" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="ImplementList.png" attr="" comment="" date="1418331869" name="ImplementList.png" path="ImplementList.png" size="61331" user="PaolaAccioly" version="1"
META FILEATTACHMENT attachment="DefaultValueAnnotation.png" attr="" comment="" date="1418332926" name="DefaultValueAnnotation.png" path="DefaultValueAnnotation.png" size="94774" user="PaolaAccioly" version="1"

Revision 32014-12-02 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"

Understanding Conflicts Arising from Collaborative Development (Website under construction)

Line: 12 to 12
 
  1. Make different edits (including removal) to the default value of the same annotation method declaration;
Bellow you can see one example of an instance of each pattern.
Added:
>
>

Results

Updated Results

 
META FORM name="MyForm"
FORM FIELD 29 Jan. 29Jan. EMN/ARMINES, ULANC, UMA, FCT/UNL
FORM FIELD 12 Feb. 12Feb. HOLOS, EMN/ARMINES

Revision 22014-11-28 - PaolaAccioly

Line: 1 to 1
 
META TOPICPARENT name="GenteAreaPublications"
Changed:
<
<

Website under construction

>
>

Understanding Conflicts Arising from Collaborative Development (Website under construction)

When working in a collaborative development environment, developers implement different tasks in an independent way. Consequently, during the integration process, one might have to deal with conflicting changes. Previous studies indicate that conflicts occur frequently and impair developers’ productivity. Such evidence motivates the development of tools to avoid, detect and solve conflicts. However, despite the existing evidence about this problem, there are still questions left unanswered that could drive up the productivity of existing tools. The goals of this PhD research work is to investigate conflict characteristics through empirical studies and propose improved ways to better support software developers working collaboratively. In this webpage you will find all the description of our conflict pattern catalog, the tools used in the study and our updated results.

The Conflict Pattern Catalog

  1. Make different edits (including removal) to the same area of the same method, constructor or field declaration;
  2. Add methods or constructors declarations with the same signature and different bodies;
  3. Add field declarations with the same id and different types or modifiers;
  4. Make different edits (including removal) to the modifiers list of the same type declaration (class, interface, annotation or enum types);
  5. Make different edits (including removal) to the same list of implements declaration;
  6. Make different edits (including removal) to the default value of the same annotation method declaration;
Bellow you can see one example of an instance of each pattern.
 
META FORM name="MyForm"
FORM FIELD 29 Jan. 29Jan. EMN/ARMINES, ULANC, UMA, FCT/UNL

Revision 12014-11-15 - PaolaAccioly

Line: 1 to 1
Added:
>
>
META TOPICPARENT name="GenteAreaPublications"

Website under construction

META FORM name="MyForm"
FORM FIELD 29 Jan. 29Jan. EMN/ARMINES, ULANC, UMA, FCT/UNL
FORM FIELD 12 Feb. 12Feb. HOLOS, EMN/ARMINES
FORM FIELD 26 Feb. 26Feb.
View topic | History: r20 < r19 < r18 < r17 | More topic actions...
 
This site is powered by the TWiki collaboration platformCopyright © 2008-2019 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding TWiki? Send feedback

mersin escort bayan adana escort bayan izmit escort ankara escort bursa escort