Translations:Source code management/120/en

For more information on merging and solving conflicts see:
 * How merge conflicts are presented with
 * Basic merge conflicts and Git Tools - Advanced Merging
 * Resolving a merge conflict using the command line
 * External merge and diff tools to use when you encounter a Git conflict.