2
What's your opinion on git rebase vs git merge? (lemmy.sdf.org)
submitted 2 years ago* (last edited 2 years ago) by provisional@lemmy.sdf.org to c/git@programming.dev
12 comments fedilink hide all child comments

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.

you are viewing a single comment's thread
view the rest of the comments
[-] Mikina@programming.dev 0 points 2 years ago

What does git pull rebase do? If I understand it correctly, it pulls in the remote changes but rebases your changes to be on top of them, instead of merging the remote and local branch? What is the intended usage of it, it sounds like a lot better way how to pull, why not to use it as default pull?

[-] GitProphet@lemmy.sdf.org 1 points 2 years ago

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

this post was submitted on 25 Jun 2023
2 points (100.0% liked)

Git

3855 readers
1 users here now

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.

founded 2 years ago
MODERATORS
Ategon@programming.dev
canpolat@programming.dev
jnovinger@programming.dev