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

[-] zygo_histo_morpheus@programming.dev 1 points 2 years ago

Ideally I'm working on a short lived branch that only I'm working on in which case I do a rebase from origin/master where I also touch up the history in case there are any "forgot x in the previous commit" type of commits before doing a merge request. I won't rebase code someone else might have pulled, and I'll quit rebasing if I get any non-trivial conflicts .

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

Follow programming.dev rules
Be excellent to each other, no hostility towards users for any reason
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