• jjjalljs@ttrpg.network
    link
    fedilink
    arrow-up
    2
    ·
    1 year ago

    If I get a big conflict and I know my change is trivial, I feel perfectly okay doing git fetch git reset --hard whatever and then reapplying my simple change as a new commit. Sort of a bootleg rebate.