#Branching
2 posts
7 min read
Practical Git Workflows #1: Branching Strategies — GitHub Flow and Trunk-Based
Compare the structure and prerequisites of Git Flow, GitHub Flow, and trunk-based development, and build criteria for choosing one based on team size and release cadence.
7 min read
Git Basics #3: Branching and Merging — Fast-forward and 3-way
From the fact that a branch is a lightweight pointer to a commit, through the difference between fast-forward and 3-way merges, to reading conflict markers and resolving them.