Version Control Systems / Git
Branching and History
Merge versus rebase, log search, reflog, bisect, and hooks.
Photo by Yosuke Ota on Unsplash
Merging versus rebasing
Merge and rebase both integrate branch work, but they rewrite history differently—one adds merge commits, the other replays commits on a new base. Compare fast-forward merges, conflict resolution, squash merges, interactive rebase, and when each approach fits a team.
Advanced Git
Revision syntax, log search, blame, reflog, history filtering, bisect, worktrees, hooks, and rerere—for when everyday commands are not enough to find a commit, recover a lost branch, or automate repository policy.