• @Skullgrid
    link
    2
    edit-2
    2 months ago

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