if you feel like merge commits are "ugly" -- why do you feel that way? what's confusing about them? what tasks are harder to do? what questions are harder for you to answer? (I kind of feel confused about merge commits too and it's hard for me to explain why, I can definitely see that there are a lot of advantages to the merge workflow)

@b0rk I'm dealing with one practical downside now. If you're trying to track down a bug that you know appeared in a certain date range by bisecting, having lots of messy merges makes this more complicated. Not impossible, just more complicated.

Follow

@sethrichards @b0rk

Doesn't it make things ~infeasible sometimes? E.g. if you have a merge of a bunch of changes on the left and a bunch on the right, and the bug is introduced in 5th change on the right, but only active in presence of some changes from the right side, bisect can't help but point at the merge commit as the culprit, which isn't very helpful in finding that 5th commit on the right side.

Sign in to participate in the conversation
Qoto Mastodon

QOTO: Question Others to Teach Ourselves
An inclusive, Academic Freedom, instance
All cultures welcome.
Hate speech and harassment strictly forbidden.