BSc Thesis ≠ Investigation of tree conflict
handling in selected version control systems
by Stefan Sperling
Mentor: Martin Gruhn
Supervising Professor: Prof. Dr. Lutz Prechelt
Virtually any version control system that facilitates concurrent development
via the Copy-Modify-Merge model tries to help its users deal with situations
where two developers make conflicting changes to the code base.
To help users deal with conflicting changes which need to be merged, conflict
detection and resolution mechanisms must be provided by the version control system.
I will describe conflicts which can occur at the level of the directory
hierarchy of a software project, and examine to what degree selected
general-purpose version control systems in common use today are able
to detect such conflicts.
This work is released under the Creative Commons Attribution 3.0 Germany Licence.
You are free:
- to Share - to copy, distribute and transmit the work
- to Remix - to adapt the work
Under the following conditions:
- Attribution. You must attribute the work to Stefan Sperling, but not in any way that suggests that he endorses you or your use of the work.
See also http://creativecommons.org/licenses/by/3.0/de/deed.en
Note that the scripts coming with the Latex source file distribution
are licensed separately under an ISC-style licence.
See the file scripts/LICENCE in the distribution.
Plain http link: http://stsp.name/thesis-tree-conflicts.pdf
Latex source files and scripts
Plain http link: http://stsp.name/thesis-tree-conflicts.tar.gz