←back to thread

303 points FigurativeVoid | 2 comments | | HN request time: 0.41s | source
Show context
ern ◴[] No.41844237[source]
Would a merge instead of a rebase have made it easier to find the bug? (Serious question)
replies(2): >>41844317 #>>41848637 #
1. salomonk_mur ◴[] No.41844317[source]
Yes, most likely. Rebase hides the fact the 2 changes happened separately, a merge would make it much easier to see the different avenues that may lead to the bug.

We purposefully try not to do rebases in my team for this reason.

replies(1): >>41844430 #
2. IAmLiterallyAB ◴[] No.41844430[source]
I'm not sure I follow, do you have an example where merging makes things more obvious?