#workflow

3 posts.

Git Rebase Explained: When to Rebase and When to Merge

A deeper look at git rebase — the mechanics, interactive rebase with squash/fixup/edit/drop, the golden rule of published branches, conflict resolution, and rerere for repeated conflicts.

Jun 16, 2026 ·10 min read · #git#intermediate#workflow

Git Remotes and Pull Requests Explained

Understand Git remotes, the difference between origin and upstream, fetch vs pull, the forking workflow, and how to open a pull request that is easy to review.

Jun 15, 2026 ·9 min read · #git#intermediate#workflow

Git Stash and Undoing Changes Safely

Learn to stash work in progress, undo commits with restore, reset, and revert, and recover lost work from the reflog — with clear warnings about which commands rewrite history.

Jun 15, 2026 ·9 min read · #git#intermediate#workflow