seahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 1 year agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square85fedilinkarrow-up11.29Karrow-down123
arrow-up11.26Karrow-down1imageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 1 year agomessage-square85fedilink
minus-squarelightnegative@lemmy.worldlinkfedilinkarrow-up13·1 year 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·1 year 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.