Blog
Notes from Kodeshala
What we teach, what each cohort is building, and how the platform is evolving.
-
Fast-forward vs Three-way Merge in Git: What `git merge` Actually Does
Why does `git merge` sometimes quietly move a pointer and other times create a new commit? Walk through both cases fast-forward and three-way (ort) merge — step by step, with diagrams.
-
Unstaging Files in Git: Why `git restore --staged` Fails with `fatal: could not resolve HEAD`
Two commands seem to unstage files in Git `git rm --cached` and `git restore --staged`. One throws `fatal: could not resolve HEAD` on a fresh repo. Here's why, traced step by step.