seahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 8 months agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square63fedilinkarrow-up11.14K
arrow-up11.12KimageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 8 months agomessage-square63fedilink
minus-squarelightnegative@lemmy.worldlinkfedilinkarrow-up12·8 months agoDo it enough times and it stops being scary. Using a tool like VSCode to perform the actual merges on individual files also helps because it shows what “yours” and “theirs” changes are from a user perspective, not a git perspective
minus-squareboomzilla@programming.devlinkfedilinkarrow-up2·8 months agoThe 3-way merge editor in VSCode is a fantastic tool. Really helps in visualizing what comes from where and preventing merge accidents.
Do it enough times and it stops being scary.
Using a tool like VSCode to perform the actual merges on individual files also helps because it shows what “yours” and “theirs” changes are from a user perspective, not a git perspective
The 3-way merge editor in VSCode is a fantastic tool. Really helps in visualizing what comes from where and preventing merge accidents.