• @xoggy
    link
    16 months ago

    When you go to merge master into your feature branch but accidentally squash master in.