MentalEdge to Programmer Humor@lemmy.mlEnglish • 2 years agoA classicsopuli.xyzimagemessage-square37fedilinkarrow-up11.24Karrow-down120
arrow-up11.22Karrow-down1imageA classicsopuli.xyzMentalEdge to Programmer Humor@lemmy.mlEnglish • 2 years agomessage-square37fedilink
minus-squareDandroidlinkfedilink7•2 years agoI always squash my commits before rebasing. Is your way easier? I never really seem to have a problem with merge conflicts.
minus-square@charliespider@lemmy.worldlinkfedilink4•2 years 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.