2 ms·
i prefer merge over rebase, but they're both pretty okay; merge is safer, but it's rare for rebase to confuse things so badly i can't figure out what went wrong
by kragen 3y ago
i prefer merge over rebase, but they're both pretty okay; merge is safer, but it's rare for rebase to confuse things so badly i can't figure out what went wrong
squash merges, by contrast, are a terrible idea. unless for some reason you make commits with comments like 'another change' or 'try again', maybe because your ci system needs a commit to work from. those should be squashed. but squashing a whole branch means that the refactoring work you had to do is mixed into the same commit with the actual functional changes, which makes it much harder to read the commit later. also, obviously, giant commits in your history cripple git bisect