• Ocelot@lemmies.world
    link
    fedilink
    arrow-up
    49
    arrow-down
    2
    ·
    edit-2
    1 year ago

    fuck it. rm -rf repository; git clone repository

    Been using git since almost as long as its been around, still can’t be bothered to learn to how to fix conflicts.

    • marcos@lemmy.world
      link
      fedilink
      arrow-up
      17
      ·
      1 year ago

      Rename it, so you can run diff on those surprising things that in no way could have changed, but are not equal to the repository. And then delete.

      Or keep the X-old; X-backup; X-bkp; X-old-old; X-old3 dirs.