this post was submitted on 21 Feb 2024
790 points (98.3% liked)

Memes

45661 readers
174 users here now

Rules:

  1. Be civil and nice.
  2. 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
[–] Zombiepirate 116 points 9 months ago (4 children)

Ah, the old merge and commit genocide.

Seen this before, we don't need a sequel.

[–] [email protected] 104 points 9 months ago (4 children)

merge and commit

Are we talking fast-forward or squash merges?

[–] [email protected] 49 points 9 months ago (2 children)
[–] [email protected] 21 points 9 months ago (1 children)
[–] [email protected] 3 points 9 months ago

Let's just blame the Nazis to avoid making anyone too upset.

[–] [email protected] 16 points 9 months ago* (last edited 9 months ago) (2 children)

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.

[–] [email protected] 9 points 9 months ago

And then wonder why nothing works...

[–] pickman_model 7 points 9 months ago

git push origin main --force

Yolo

[–] [email protected] 5 points 9 months ago

Let's rebase, for the fun of it…

[–] jaybone 3 points 9 months ago

But they don’t need SQL.

[–] [email protected] 2 points 9 months ago

Rebase/squash merge for sure.

Definitely lost some history in there.

[–] [email protected] 12 points 9 months ago

What does the CI/CD pipeline look like for this?

[–] [email protected] 5 points 9 months ago

Genocide in Eastern Europe? Never! Never I tell you!

[–] [email protected] 4 points 9 months ago* (last edited 9 months ago) (1 children)

That was after Tito died. He never would have let something like that happen if he was still alive.