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

Git

2938 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
canpolat
jnovinger
26
What's your opinion on git rebase vs git merge? (lemmy.sdf.org)
submitted 2 years ago* (last edited 2 years ago) by [email protected] to c/git
23 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] 6 points 2 years ago

I'll often commit half finished or outright broken code to a private branch for my own purposes. Then I'll rebase before pushing to make the history make more sense to the team and get rid of fluff commits.