Julia Evans on Nostr: i've been trying to figure out why some people prefer merge and some people prefer ...

i've been trying to figure out why some people prefer merge and some people prefer rebase. I feel like there must be some systematic reasons, like "people in situation X tend to prefer rebase, people in situation Y tend to prefer merge”

my only thought so far is that small short-lived changes work well with rebase, and longer-lived branches are maybe better to merge

(not looking for explanations of why you think rebase/merge is better here or why the people who disagree with you are wrong)