• pastermil
    link
    fedilink
    arrow-up
    10
    ·
    1 year ago

    Should’ve pulled first before starting your work.

    • atyaz@reddthat.com
      link
      fedilink
      arrow-up
      7
      ·
      1 year ago

      Sometimes my work takes a while and other people push in the meantime. Guess I’m dying the fire.

        • atyaz@reddthat.com
          link
          fedilink
          arrow-up
          6
          ·
          1 year ago

          Boom, merge conflict. The only thing left to me is force push and delete everyone’s changes.

          • xmunk
            link
            fedilink
            arrow-up
            3
            ·
            1 year ago

            Eh, it’s probably fine. Those chumps don’t do anything useful.