Been using Git and Gerrit for years, yet I still look up the tutorial on how to rebase
-
Been using Git and Gerrit for years, yet I still look up the tutorial on how to rebase
-
Sammy (plushie edition) :nonbinaryFlag:replied to Sammy (plushie edition) :nonbinaryFlag: last edited by
oh i LOVE merge commits i LOVE THEM so MUCH they are SO EASY to resolve and BREAK NOTHING AHDHJSDHJSHJSDAHJaaaaaaaaaaaaaaaaaaaaaafucjk
-
Patrycja (X15p)replied to Sammy (plushie edition) :nonbinaryFlag: last edited by
@theresnotime we love merge christmas trees in here
-
Sammy (plushie edition) :nonbinaryFlag:replied to Sammy (plushie edition) :nonbinaryFlag: last edited by
suffer with me colleagues
-
Sammy (plushie edition) :nonbinaryFlag:replied to Patrycja (X15p) last edited by
@ptrc that's actually kinda pretty though :3
-
stwalkersterreplied to Sammy (plushie edition) :nonbinaryFlag: last edited by
@theresnotime `man git-rerere`. Doesn't solve all your problems (and probably adds new ones knowing git), but should at least mean you're not resolving the same conflicts again and again through a rebase
-
Sammy (plushie edition) :nonbinaryFlag:replied to stwalkerster last edited by [email protected]
@stwalkerster TIL about
git-rerere
! Unfortunately wouldn't have solved this conflict as it was novel but good to know! thank you! -
Clara (Hobo arc) 🍉💕🌈replied to Sammy (plushie edition) :nonbinaryFlag: last edited by
@theresnotime don't wish for that, or one day someone will "invent" git but with an AI conflict solver
-
Sammy (plushie edition) :nonbinaryFlag:replied to Clara (Hobo arc) 🍉💕🌈 last edited by
@Pandora ohgodohgodohgod