• @[email protected]
    link
    fedilink
    711 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)

      • @Nahdahar
        link
        81 year ago

        Except if you’re an employer in a very small company.

        Source: my boss did this at the first company I worked at.