seahorse [Ohio] to Programmer Humor@lemmy.mlEnglish • 2 years agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square79fedilinkarrow-up11.26Karrow-down10
arrow-up11.26Karrow-down1imageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio] to Programmer Humor@lemmy.mlEnglish • 2 years agomessage-square79fedilink
minus-square@lightnegative@lemmy.worldlinkfedilink13•2 years 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-square@boomzilla@programming.devlinkfedilink2•2 years 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.