@[email protected] to [email protected] • 7 months agoSomeone should tell himlemmy.dbzer0.comimagemessage-square115fedilinkarrow-up1831arrow-down115
arrow-up1816arrow-down1imageSomeone should tell himlemmy.dbzer0.com@[email protected] to [email protected] • 7 months agomessage-square115fedilink
minus-square@[email protected]linkfedilink107•7 months ago merge and commit Are we talking fast-forward or squash merges?
minus-square@[email protected]linkfedilink3•7 months agoLet’s just blame the Nazis to avoid making anyone too upset.
minus-square@[email protected]linkfedilink16•edit-27 months agoBonus 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.
minus-square@[email protected]linkfedilink2•7 months agoRebase/squash merge for sure. Definitely lost some history in there.
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.