Translations:Source code management/119/en

Merging local branches with will occasionally present conflicts, as the files may have been changed at the same time in the same place. If this happens you should fix the files, and re-merge.