You are viewing a single thread.
View all comments View context
107 points

merge and commit

Are we talking fast-forward or squash merges?

permalink
report
parent
reply
50 points

Squash, definitely squash.

permalink
report
parent
reply
21 points

Who do we git blame ?

permalink
report
parent
reply
3 points

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

permalink
report
parent
reply
16 points
*

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.

permalink
report
parent
reply
9 points

And then wonder why nothing works…

permalink
report
parent
reply
7 points

git push origin main --force

Yolo

permalink
report
parent
reply
5 points

Let’s rebase, for the fun of it…

permalink
report
parent
reply
3 points

But they don’t need SQL.

permalink
report
parent
reply
2 points

Rebase/squash merge for sure.

Definitely lost some history in there.

permalink
report
parent
reply

Memes

!memes@lemmy.ml

Create post

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.

Community stats

  • 8.3K

    Monthly active users

  • 12K

    Posts

  • 265K

    Comments