0x4E4F@lemmy.dbzer0.com to Memes@lemmy.ml · 1 year agoSomeone should tell himlemmy.dbzer0.comimagemessage-square132fedilinkarrow-up1863arrow-down115
arrow-up1848arrow-down1imageSomeone should tell himlemmy.dbzer0.com0x4E4F@lemmy.dbzer0.com to Memes@lemmy.ml · 1 year agomessage-square132fedilink
minus-squarechtk@feddit.nllinkfedilinkarrow-up107·1 year ago merge and commit Are we talking fast-forward or squash merges?
minus-squareRouthinator@startrek.websitelinkfedilinkEnglisharrow-up50·1 year agoSquash, definitely squash.
minus-squareArtyom@lemm.eelinkfedilinkarrow-up4arrow-down1·1 year agoLet’s just blame the Nazis to avoid making anyone too upset.
minus-squareGork@lemm.eelinkfedilinkarrow-up16·edit-21 year 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-square0x4E4F@lemmy.dbzer0.comOPlinkfedilinkarrow-up9·1 year agoAnd then wonder why nothing works…
minus-squarepickman_model@lemmy.worldlinkfedilinkarrow-up7·1 year agogit push origin main --force Yolo
minus-squarePoolloverNathan@programming.devlinkfedilinkEnglisharrow-up5·1 year agoLet’s rebase, for the fun of it…
minus-squarenavi@lemmy.tespia.orglinkfedilinkarrow-up2·1 year 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.