• Skullgrid@lemmy.world
    link
    fedilink
    arrow-up
    2
    ·
    edit-2
    23 days ago

    you forgot the part where you have to rebase your branch and that causes merge conflicts that were resolved later but somehow still persists.