this post was submitted on 04 Apr 2024
1110 points (98.2% liked)
Programmer Humor
19488 readers
1143 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 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
This is really the only sane way to do it. I have run into some wonkyness with the commit history of the target branch commits not resembling
git log
, but that's usually for commits outside of what I'm trying to merge.Edit: squashing commits down this way also helps reduce problems with replaying commit history on the actual rebase. In most cases you don't need all your "microcommits" in the history, and fewer commits just takes less time to reconcile.