TOPIC COLLECTION03 GUIDES
Git workflows
Branching, diffs, conflicts, history, and review practices that keep Git understandable under real delivery pressure.
Git workflows6 min read
How 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 noteGit workflows5 min read
How 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 noteGit workflows5 min read
Trunk-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