• Ocelot
    link
    fedilink
    74
    edit-2
    11 months 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.

    • @[email protected]
      link
      fedilink
      1811 months 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.

      • @BlueBockser
        link
        1611 months ago

        I think git clean is more appropriate. With git stash you create a stash which you then have to drop.

        • @HairHeel
          link
          3811 months ago

          Who says you have to drop it? I’ve got stuff from 2007 in there somewhere.

          • @BlueBockser
            link
            111 months ago

            Of course you don’t have to, but if you don’t plan on ever using it then it’s just trash living in your git folder. If you do plan on using it again in the future, then it’s usually better to make it a branch so you can push it to a remote.

        • sickday
          link
          fedilink
          911 months ago

          Yea but you can always git pop if you need any of your stashed changes

          • Ocelot
            link
            fedilink
            811 months ago

            i chuckled at the thought of ‘git poop’ being a command. I’m going to alias that to something.

    • @static_motion
      link
      English
      1811 months ago

      git restore is a pretty new command AFAIK. Those of us who learned git before its existence have probably stuck to the old ways of git reset --hard.

  • @[email protected]
    link
    fedilink
    English
    811 months ago

    alias mybad=‘git add -u && git commit --amend --no-edit && git push --force-with-lease’

  • Martin
    link
    fedilink
    211 months ago

    That is stupid. Those commands are for different use cases.