Category Archives: Git

Kinh nghiệm về git

Git – Resolve merge conflicts

Many time, when we do git push/pull or git merge, we end up with conflicts. In most case, solution to merge-conflicts is as simple as discarding local changes or remote/other… Read more »

git diff

A simple graphic makes this clearer: git diff Shows the changes between the working directory and the index. This shows what has been changed, but is not staged for a… Read more »