cm0002@lemdro.id to Programmer Humor@programming.devEnglish · 2 个月前When you screw up gitlemmy.zipimagemessage-square66fedilinkarrow-up1785arrow-down17
arrow-up1778arrow-down1imageWhen you screw up gitlemmy.zipcm0002@lemdro.id to Programmer Humor@programming.devEnglish · 2 个月前message-square66fedilink
minus-squaremagic_lobster_party@fedia.iolinkfedilinkarrow-up10·2 个月前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.
minus-squareSpaceCowboy@lemmy.calinkfedilinkarrow-up5arrow-down1·2 个月前Also 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.