cm0002@lemdro.id to Programmer Humor@programming.devEnglish · 12 days agoWhen you screw up gitlemmy.zipimagemessage-square66linkfedilinkarrow-up1790
arrow-up1790imageWhen you screw up gitlemmy.zipcm0002@lemdro.id to Programmer Humor@programming.devEnglish · 12 days agomessage-square66linkfedilink
minus-squaremagic_lobster_party@fedia.iolinkfedilinkarrow-up9·12 days 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-up5·12 days 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.