231
top 22 comments
sorted by: hot top controversial new old
[-] Ocelot@lemmies.world 73 points 1 year ago* (last edited 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 18 points 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.

[-] mvirts@lemmy.world 52 points 1 year ago* (last edited 1 year ago)

mv .git .git_old7

git init

git add .

git commit -m "almost working"

[-] minorsecond@lemm.ee 5 points 1 year ago

Lmao this is perfect

[-] joyjoy@lemmy.world 14 points 1 year ago

Neither remove untracked files sadly.

[-] sickday@kbin.social 9 points 1 year ago
[-] BlueBockser@programming.dev 16 points 1 year ago

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

[-] HairHeel@programming.dev 37 points 1 year ago

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

[-] BlueBockser@programming.dev 1 points 1 year 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@kbin.social 9 points 1 year ago

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

[-] Ocelot@lemmies.world 8 points 1 year ago

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

[-] PoastRotato@lemmy.world 9 points 1 year ago* (last edited 1 year ago)

You could make it run git pop until it clears the whole stash

[-] slampisko@czech-lemmy.eu 1 points 1 year ago

That's why I follow it with git clean -fd

[-] Sonotsugipaa@lemmy.dbzer0.com 11 points 1 year ago

git restore . ?
Or am I misinterpreting the problem?

[-] static_motion@programming.dev 18 points 1 year 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.

[-] TheSealStartedIt@feddit.de 3 points 1 year ago

Yep, I just learned of this command..

[-] girltwink@lemmy.world 8 points 1 year ago

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

[-] zexu@lemmy.world 2 points 1 year ago

๐Ÿ˜‚๐Ÿ˜‚๐Ÿ˜‚

[-] Synthead@lemmy.world 5 points 1 year ago
[-] niyrme@lemmy.world 2 points 1 year ago
[-] mundane@feddit.nu 2 points 1 year ago

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

load more comments
view more: next โ€บ
this post was submitted on 28 Jul 2023
231 points (95.3% liked)

Programmer Humor

19450 readers
732 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 1 year ago
MODERATORS