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.

  • @canpolat@programming.devM
    link
    fedilink
    English
    141 year ago

    It’s correct that rebase rewrites history, but it’s important to identify when it’s not acceptable. If you are working on a branch that is shared by others (typically main), you should never use rebase. But it’s an acceptable practice when used properly. I use rebase on my feature branches whenever necessary. If it fell behind the main branch I do git fetch followed by git rebase origin/main, resolve the merge conflicts and keep coding. I also use interactive rebase when I need to tidy things up before merging the feature branch to main.

    • Baldur Nil
      link
      fedilink
      English
      5
      edit-2
      1 year ago

      That’s what I do as well. Where I work, it’s common to have branches that take long to be ready for merge (because of bureaucracy), but because of many teams working on the same app, the upstream branch changes quite often.

      I see some coworkers make just a few changes and a lot of times reverting stuff so the diff might be 1 line in the end, but the commit history is a mess of 30 commits of merges, triggering pipelines and undone stuff that was discarded later.

      Then sometimes they have to find where they changed something they broke their feature and it’s a hell time to find what commit actually has any relevance for the final result.

    • JackbyDev
      link
      fedilink
      English
      41 year ago

      Rebasing is fine for any unpushed commits including ones on shared branches.