11 ms·
Merging branches was roughly the equivalent of git cherry-pick. There's tracking to prevent you from pulling the same commit twice, but not much else. --reint
by Izkata 2y ago
Merging branches was roughly the equivalent of git cherry-pick. There's tracking to prevent you from pulling the same commit twice, but not much else.
--reintegrate was introduced later, and even with that it was easy to get wrong.