817

Someone should tell him (lemmy.dbzer0.com)

submitted 4 months ago by [email protected] to c/[email protected]

130 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[-] [email protected] 116 points 4 months ago

Ah, the old merge and commit genocide.

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

[-] [email protected] 106 points 4 months ago

merge and commit

Are we talking fast-forward or squash merges?

[-] [email protected] 50 points 4 months ago

Squash, definitely squash.

[-] [email protected] 21 points 4 months ago

Who do we git blame ?

[-] [email protected] 3 points 4 months ago

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

[-] [email protected] 16 points 4 months ago* (last edited 4 months ago)

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 4 months ago

And then wonder why nothing works...

[-] [email protected] 7 points 4 months ago

git push origin main --force

Yolo

[-] [email protected] 5 points 4 months ago

Let's rebase, for the fun of it…

[-] [email protected] 3 points 4 months ago

But they don’t need SQL.

[-] [email protected] 2 points 4 months ago

Rebase/squash merge for sure.

Definitely lost some history in there.

load more comments (14 replies)

this post was submitted on 21 Feb 2024

817 points (98.2% liked)

Memes

44230 readers

1663 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

[email protected]