merge

1 article · newest first

Hand-drawn illustration of two hands peeling a strip of coral commit dots off a branch and laying it onto the end of a violet line of commits

Git rebase vs merge vs squash: which to use, and how to undo a bad rebase

Merge keeps the story, rebase tidies it, squash flattens it. Here are plain decision rules, the one thing you must never rebase, and how the reflog gets your commits back, with AI coding agents in the mix.

Aliteq Team · 3h ago · 9 min