• lseif@sopuli.xyz
    link
    fedilink
    arrow-up
    73
    arrow-down
    3
    ·
    1 year ago

    if u ever get a tricky merge conflict, just git push --force. this automatically works out the right code to keep (your own)