• slipperydippery@lemmy.world
    link
    fedilink
    English
    arrow-up
    1
    ·
    1 year ago

    I’ve accidentally had my git config set to rebase at my work. Every git pull merge dragged me into some conflict hell.

    I’m still interested and will read this article, mainly to see if there is a way to use it if the rest of the department isn’t.