• jaemo@sh.itjust.works
    link
    fedilink
    arrow-up
    5
    ·
    7 months ago

    100% they do. Rebase is an everyday thing, merge is for PRs (for me anyway). Or merges are for regular branches if you roll that way. The only wrong answer is the one that causes you to lose commits and have to use reflog, cos…well, then you done messed up now son… (but even then hope lives on!)