Це стара версія документу!
git clone https://github.com/v2e/uTox
git checkout <branch_name>
git merge --no-ff <another_branch_name>
http://genomewiki.ucsc.edu/index.php/Resolving_merge_conflicts_in_Git#Common_questions_for_when_git_fails_during_the_merge