Merge conflicts and learn how to resolve it in git.
[Tutorial Git] git fetch: Verificando commits remotos
Pointers and tips: dispelling the magic of git merge
Advanced GIT tutorial - Cherry-pick vs rebase vs merge
Git merge, git rebase, and crawling out of the git hole
Should you rebase or merge to update feature branches in git?