I basically only use git merge like Theo from T3 stack. git rebase rewrites your commit history, so I feel there’s too much risk to rewriting something you didn’t intend to. With merge, every commit is a real state the code was in.

  • JackbyDev
    link
    fedilink
    English
    61 year ago

    They’re both different commands and I use them for different things.