• lightnegative@lemmy.world
    link
    fedilink
    arrow-up
    13
    ·
    8 months ago

    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

    • boomzilla@programming.dev
      link
      fedilink
      arrow-up
      2
      ·
      8 months ago

      The 3-way merge editor in VSCode is a fantastic tool. Really helps in visualizing what comes from where and preventing merge accidents.