MentalEdge@sopuli.xyz to Programmer Humor@lemmy.mlEnglish · 11 months agoA classicsopuli.xyzimagemessage-square37fedilinkarrow-up11.14K
arrow-up11.12KimageA classicsopuli.xyzMentalEdge@sopuli.xyz to Programmer Humor@lemmy.mlEnglish · 11 months agomessage-square37fedilink
minus-squareDandroid@dandroid.applinkfedilinkarrow-up6·11 months 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·11 months 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.