Created the 'git tips' article

The article contains for now instructions on how to resolve
a merge conflict