this post was submitted on 04 Apr 2024
1110 points (98.2% liked)
Programmer Humor
19821 readers
779 users here now
Welcome to Programmer Humor!
This is a place where you can post jokes, memes, humor, etc. related to programming!
For sharing awful code theres also Programming Horror.
Rules
- Keep content in english
- No advertisements
- Posts must be related to programming or programmer topics
founded 2 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Anyone mind explaining to me how
git rebaseis worth the effort?git mergehas it's own issues but I just don't see any benefit to rebase over it.Well, rebase allows you to resolve the same conflict ten times in a row instead of doing it once. How cool is that?
Squash your branch first
Doesn't this defeat the purpose, may as well merge then no?
Do not merge your unfinished stuff into main.
I don't like merging main into my branch because I don't understand git, and I feel like that can make a confusing history.