Blog
Mert Özen's blog posts on software development, backend, frontend, and DevOps.
Series
2 posts found
#git-branch
DevOps
PART 09
Git Merge: Fast-forward, Three-way Merge and the Merge Commit
We see with real output the difference between fast-forward and three-way merge, the role of the common ancestor (git merge-base), the inside of a two-parent merge commit, the --no-ff and --ff-only options, the ort strategy that has been the default since Git 2.34, and cleaning up branches after a merge.
6 Nov 2026
8 min
2
DevOps
PART 08
Git Branch: A Movable Pointer, HEAD and git switch
We see with real output that a branch is a 41-byte file holding a single commit hash, how HEAD works, listing, renaming and deleting with git branch, moving around with git switch and switch -c, getting into and out of detached HEAD, and the old use of git checkout.
6 Nov 2026
9 min
2