seahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 1 year agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square53fedilinkarrow-up1589arrow-down18
arrow-up1581arrow-down1imageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 1 year agomessage-square53fedilink
minus-squarejack@monero.townlinkfedilinkarrow-up28arrow-down1·1 year agoSolving merge conflicts or rebasing is not simple
minus-squarelightnegative@lemmy.worldlinkfedilinkarrow-up7·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
Solving merge conflicts or rebasing is not simple
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