this post was submitted on 06 Feb 2026
15 points (85.7% liked)

Git

4552 readers
11 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
15
Rebase vs Merge guide (slicker.me)
submitted 1 week ago by monica_b1998@lemmy.world to c/git@programming.dev
2 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[–] KissYagni@programming.dev 5 points 1 week ago* (last edited 1 week ago)

I was prepared to use my Cunningham Law mental model to correct your article, but no. I have nothing to say 😊

I've seen way too many wrong usage of git merge/rebase in lots of article but you get the point and clearly explained it.

Maybe just at the end, instead of

git checkout main
git pull
git checkout feature-branch
git rebase main

I would just do:

git fetch
git rebase origin/main

This avoid checkout main and checkout back to working branch, which may takes times on big repos.