git merge conflict tutorial

join shbcf.ru