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

Memes

45187 readers
1663 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
gary_host_laptop@lemmy.ml
sexy_peach@feddit.de
cyclohexane@lemmy.ml
cypherpunks@lemmy.ml
848
Someone should tell him (lemmy.dbzer0.com)
submitted 7 months ago by 0x4E4F@lemmy.dbzer0.com to c/memes@lemmy.ml
132 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] chtk@feddit.nl 107 points 7 months ago (4 children)

merge and commit

Are we talking fast-forward or squash merges?

[–] Routhinator@startrek.website 50 points 7 months ago (2 children)

Squash, definitely squash.

[–] Tetsuo@jlai.lu 21 points 7 months ago (1 children)

Who do we git blame ?

[–] Artyom@lemm.ee 3 points 7 months ago

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

[–] Gork@lemm.ee 16 points 7 months ago* (last edited 7 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.

[–] 0x4E4F@lemmy.dbzer0.com 9 points 7 months ago

And then wonder why nothing works...

[–] pickman_model@lemmy.world 7 points 7 months ago

git push origin main --force

Yolo

[–] PoolloverNathan@programming.dev 5 points 7 months ago

Let's rebase, for the fun of it…

[–] jaybone@lemmy.world 3 points 7 months ago

But they don’t need SQL.

[–] navi@lemmy.tespia.org 2 points 7 months ago

Rebase/squash merge for sure.

Definitely lost some history in there.