cm0002@lemdro.id to Programmer Humor@programming.devEnglish · 3 months agoWhen you screw up gitimagemessage-square65linkfedilinkarrow-up1795arrow-down17
arrow-up1788arrow-down1imageWhen you screw up gitcm0002@lemdro.id to Programmer Humor@programming.devEnglish · 3 months agomessage-square65linkfedilink
minus-squaremagic_lobster_party@fedia.iolinkfedilinkarrow-up10·3 months agoKeep your commits small. Merge often. That will reduce the likelihood of terrible merge conflicts. If you’re not sharing your work with your team mates for a long time, then you’re setting yourself up for trouble.
minus-squareSpaceCowboy@lemmy.calinkfedilinkarrow-up5arrow-down1·3 months agoAlso rebase is usually better than merge.
Keep your commits small. Merge often. That will reduce the likelihood of terrible merge conflicts.
If you’re not sharing your work with your team mates for a long time, then you’re setting yourself up for trouble.
Also rebase is usually better than merge.