MentalEdge@sopuli.xyz to Programmer Humor@lemmy.mlEnglish · 1 year agoA classicsopuli.xyzimagemessage-square37fedilinkarrow-up11.15K
arrow-up11.13KimageA classicsopuli.xyzMentalEdge@sopuli.xyz to Programmer Humor@lemmy.mlEnglish · 1 year agomessage-square37fedilink
minus-squareDandroid@dandroid.applinkfedilinkarrow-up6·1 year agoI always squash my commits before rebasing. Is your way easier? I never really seem to have a problem with merge conflicts.
minus-squarecharliespider@lemmy.worldlinkfedilinkarrow-up4·1 year agoWe squash when merging. Final git history is super clean and linear.
I always squash my commits before rebasing. Is your way easier? I never really seem to have a problem with merge conflicts.
We squash when merging. Final git history is super clean and linear.