• lightnegative@lemmy.world
    link
    fedilink
    arrow-up
    7
    ·
    1 year 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