Git

Branching strategies, conventional commits, and hotfixes under pressure.

git log, bisect, reflog, cherry-pick, and rewriting history safely.

Remotes, pull requests, resolving conflicts, and code review flow.

Stash, worktrees, hooks, reset vs restore, and disaster recovery via reflog.

When each is right, why the consensus answer is 'rebase your branch, merge to main'.

Surgical commits — hotfix workflows, release backports, and conflict mechanics.

git reflog, git fsck — why no commit truly disappears for 30 days.

Vendoring git history — the submodule pain points and the subtree alternative.

Client-side and server-side hooks — and why CI is a server-side hook in disguise.