@0x4E4F@lemmy.dbzer0.com to Memes@lemmy.ml • 9 months agoSomeone should tell himlemmy.dbzer0.comimagemessage-square127fedilinkarrow-up1827arrow-down115
arrow-up1812arrow-down1imageSomeone should tell himlemmy.dbzer0.com@0x4E4F@lemmy.dbzer0.com to Memes@lemmy.ml • 9 months agomessage-square127fedilink
minus-square@chtk@feddit.nllinkfedilink102•9 months ago merge and commit Are we talking fast-forward or squash merges?
minus-square@Routhinator@startrek.websitelinkfedilinkEnglish48•9 months agoSquash, definitely squash.
minus-square@Artyom@lemm.eelinkfedilink4•9 months agoLet’s just blame the Nazis to avoid making anyone too upset.
minus-square@Gork@lemm.eelinkfedilink15•edit-29 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@navi@lemmy.tespia.orglinkfedilink2•9 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
But they don’t need SQL.
Rebase/squash merge for sure.
Definitely lost some history in there.