Rebase vs Merge guide

https://slicker.me/git/rebase-vs-merge.html

15 points · 4 comments · view on lemmy.world

4 Comments

KissYagni@programming.dev · 5 pts · 223d

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.

FizzyOrange@programming.dev · 3 pts · 223d

This is just straight up "ChatGPT write me an article about merge vs rebase".

It's also missing any discussion of squashing, CI, git blame, git bisect etc.

corsicanguppy@lemmy.ca · 1 pts · 223d (1 reply)

Content-free post?

monica_b1998@lemmy.world · 1 pts · 223d

it's a link. is it not working for you?