25

What's your opinion on git rebase vs git merge?

posted
*
by
Avatar
provisional@lemmy.sdf.org
in
Avatar
git@programming.dev
27 comments
hidereport

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.

Sort:
HotTopControversialNewOld
You are viewing a single thread.
View all comments View context
Avatar
epchris@programming.dev
5 points

love this approach and it’s what I usually use. I also don’t rebase after opening a PR (GitHub) because force pushing ruins reviewer context in the GH UI. so after the PR is open I merge main/master in instead of rebasing.

permalink
report
parent
reply

Git

!git@programming.dev

Create post

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

  1. Follow programming.dev rules
  2. Be excellent to each other, no hostility towards users for any reason
  3. No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

Community stats

  • 61

    Monthly active users

  • 218

    Posts

  • 904

    Comments

Community moderators