Xerxes Blog

Bringing Only Part of a Branch Into Main

engineering #git #code-review #workflow

Bringing Only Part of a Branch Into Main

Sometimes a branch contains one ready change and several unfinished ones, and merging the whole branch is the wrong move. This post will compare cherry-picking, interactive rebase, and splitting commits, with an emphasis on choosing the smallest history operation that keeps the result reviewable.