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.

  • @GitProphet
    link
    English
    11 year ago

    Because rebasing changes the history, which would mess with other people’s copies of the same branch, wherefore it shouldn’t be default.