Master Advanced Git Commands: Amend, Merge, Resolve Conflicts, and Bulk Delete Tags

Git is the most advanced distributed version control system, capable of handling projects from tiny to massive. Below are some useful less‑common commands.

Often we use Git, but sometimes we need more complex commands. If you forget them, bookmark this guide.

Amend a commit

To correct a typo or wrong information in the last commit, use: git commit --amend After editing the commit message, push forcefully:

git commit --amend
// ... edit your message
git push --force example-branch

Combine commits

If you have many commits with messy messages, you can squash them:

git reset --soft "HEAD~n"
# (~n means ~1, ~2, …)
git commit --amend

Quickly resolve conflicts

When merging, you can automatically accept all changes from the other side:

# Accept all theirs
git pull -X theirs
git checkout --theirs path/to/file

Or accept all your own changes:

# Accept all ours
git pull -X ours

Batch delete tags

When many tags accumulate, delete them in bulk:

git tag -d TAG1 TAG2 TAG3
git push REMOTE --delete TAG1 TAG2 TAG3