JPDev@programming.dev to Programmer Humor@programming.dev · 2 years agoRebase Supremacyprogramming.devimagemessage-square231linkfedilinkarrow-up11.13Karrow-down122
arrow-up11.11Karrow-down1imageRebase Supremacyprogramming.devJPDev@programming.dev to Programmer Humor@programming.dev · 2 years agomessage-square231linkfedilink
minus-squarejjjalljs@ttrpg.networklinkfedilinkarrow-up1arrow-down1·2 years agoSquash your branch first
minus-squarerapist1@lemmy.worldlinkfedilinkarrow-up2·2 years agoDoesn’t this defeat the purpose, may as well merge then no?
minus-squarejjjalljs@ttrpg.networklinkfedilinkarrow-up1·2 years agoDo not merge your unfinished stuff into main. I don’t like merging main into my branch because I don’t understand git, and I feel like that can make a confusing history.
Squash your branch first
Doesn’t this defeat the purpose, may as well merge then no?
Do not merge your unfinished stuff into main.
I don’t like merging main into my branch because I don’t understand git, and I feel like that can make a confusing history.