• boomzilla
    link
    fedilink
    arrow-up
    2
    ·
    1 year ago

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