this post was submitted on 21 Feb 2024
848 points (98.3% liked)
Memes
45655 readers
2467 users here now
Rules:
- Be civil and nice.
- Try not to excessively repost, as a rule of thumb, wait at least 2 months to do it if you have to.
founded 5 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Ah, the old merge and commit genocide.
Seen this before, we don't need a sequel.
Are we talking fast-forward or squash merges?
Squash, definitely squash.
Who do we git blame ?
Let's just blame the Nazis to avoid making anyone too upset.
Bonus points if the different branches are all large, have a decent amount of overlap, and rely on different revision dependencies. And pushed through with minimal review or oversight.
And then wonder why nothing works...
git push origin main --force
Yolo
Let's rebase, for the fun of it…
But they don’t need SQL.
Rebase/squash merge for sure.
Definitely lost some history in there.