Conflicts and resolutions in Git-based open-source projects

For more info about our services contact : help@bestpfe.com

Table of contents

Chapter 1
Introduction
1.1 Study Context
1.2 Research Questions
1.3 Contributions
1.3.1 The first part : Conflicts and resolutions in Git-based open-source projects
1.3.2 The second part : Time-position characterization of CE using ShareLaTeX
1.4 Structure of the Thesis
Chapter 2
State of the art
2.1 Basic notions
2.1.1 Version control system
2.1.2 Git- A decentralized version control system
2.1.3 Real-time collaborative editing
2.2 Studies on Collaborative work based on version control systems
2.3 Studies on Collaborative editing using real-time web-based collaborative editors
2.4 Awareness in collaborative editing
2.5 Chapter conclusion
Chapter 3
Merge Conflicts and Resolutions in Git-based Open Source Projects
3.1 Introduction
3.2 Measurements
3.2.1 Integrations and conflicts on files
3.2.2 Integrations and conflicts based on release dates
3.2.3 Conflict resolution
3.2.4 Adjacent-line conflicts
3.3 Discussion
3.4 Chapter conclusion
Chapter 4
Time-position characterization of Conflicts in Collaborative Editing
4.1 Introduction
4.2 Related work
4.3 Measurements
4.3.1 Time dimension
4.3.2 Time-position analysis
4.4 Algorithms
4.4.1 The calculation of ‘time-distance’ and ‘position-distance’
4.4.2 Time, Position and Time-Position collaborative edits classifying
4.4.3 ‘Potential border conflict’ and ‘Potential insertion conflict’ detection
4.5 Chapter conclusion
Chapter 5
Conclusion and Perspectives
5.1 Conclusion
5.2 Publications
5.3 Perspectives
5.3.1 Analysis of CE’s traces of Git-based projects
5.3.2 Higher-order conflicts and roll-back action
5.3.3 Time-position analysis of CE’s logs collected from real-time web-based collaborative editors
5.3.4 Potential conflicts in real-time collaborative editing