logoalt Hacker News

sunshowerslast Saturday at 7:33 PM1 replyview on HN

Do you know what criss-cross merges are and why they're bad?


Replies

cluckindanyesterday at 3:34 PM

I’m sure you’re here to educate me, but this is not about criss-cross merges between two different work branches, this is about whether it’s better to rebase a work branch onto the main branch, or to pull the changes from the main branch to the work branch.

show 1 reply