{'fraction_non_alphanumeric': 0.015463917525773196, 'fraction_numerical': 0.0, 'mean_word_length': 5.473333333333334, 'pattern_counts': {'":': 0, '<': 0, '<?xml version=': 0, '>': 0, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
Merging and Renaming in Revision Control Software

Modern projects often involve geographically spread people working on the same project simultaneously. Thus the contents of the project are likely to be read and edited by more people than the original authors of the content. That’s why refactoring becomes an important part of the project development since refactoring, amongst others, enhances the readability of the material. Since revision control systems are widely used in bigger projects, they must thus provide essential tools such as good renaming functions, which is important for refactoring, as well as good merging support which enables several developers/editors merge their work without doing much manual work. This thesis presents and discusses different merging techniques as well as different approaches to conflict detection, avoidance, and reduction. Moreover a solution to some renaming problems in Subversion is presented and another is discussed.