• evilgiraffe666@ttrpg.network
    cake
    link
    fedilink
    English
    arrow-up
    7
    ·
    7 months ago

    Right, on shared branch you might need to pull first if you’re out of date (and you would be if you’re all leaving the office at the same time), and that could cause a merge conflict.

    It’s like I always said, bad branching strategies are a fire safety issue.