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

Git

2632 readers
2 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 1 year ago
MODERATORS
[email protected]
[email protected]
[email protected]
16
What's your opinion on git rebase vs git merge? (lemmy.sdf.org)
submitted 1 year ago* (last edited 1 year ago) by [email protected] to c/[email protected]
27 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
[–] [email protected] 3 points 1 year ago (1 children)

Please never rebase after you open a pull request. It breaks the iterative workflow of code reviews -- it makes it hard to see if issues brought up in comments were addressed or not.

[–] [email protected] 1 points 1 year ago

That depends on the PR tool. I don't know how others work, but Azure DevOps handles rebases quite well (as long as you are rebasing to the target of your PR).