Git workflows
Branching, diffs, conflicts, history, and review practices that keep Git understandable under real delivery pressure.
Backport Fixes Safely with Git Cherry-Pick
A disciplined backport workflow for selecting a fix, checking dependencies, resolving target-branch conflicts, testing the result, and preserving provenance.
Read field noteFind Regressions Faster with Git Bisect
A reproducible Git bisect method that defines good and bad endpoints, automates a trustworthy predicate, handles untestable commits, and preserves evidence.
Read field noteGit Restore, Reset, or Revert: Choose by State
A state-based guide to choosing Git restore, reset, or revert without confusing working-tree edits, staged content, local commits, and shared history.
Read field noteUse Git Worktrees for Parallel Branch Work
A practical Git worktree workflow for reviewing, testing, and fixing multiple branches without stashing changes or duplicating repository history.
Read field noteUse Interactive Rebase Before Sharing a Branch
A safe interactive rebase workflow for clarifying private branch history, resolving conflicts, comparing rewritten commits, and avoiding damage to shared work.
Read field noteRecover Lost Commits with Git Reflog
A recovery-first method for finding displaced Git commits, preserving them with a rescue branch, and verifying the result without rewriting more history.
Read field noteHow to Review a Git Diff Without Missing the Real Risk
A layered method for reviewing Git diffs by intent, boundaries, behavior, data flow, security, tests, and release impact instead of reading line by line.
Read field noteHow to Resolve Git Merge Conflicts Without Losing Intent
A safe process for understanding, resolving, testing, and documenting Git merge conflicts while preserving the intent of both sides of a change.
Read field noteTrunk-Based Development vs GitFlow: Choose by Delivery Constraints
A practical comparison of trunk-based development and GitFlow based on release cadence, review capacity, deployment safety, support windows, and team structure.
Read field note