Spyke
lemmies.world

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.

65

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.

17
lemmy.world

mv .git .git_old7

git init

git add .

git commit -m "almost working"

47
programming.dev

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

14
HairHeelreply
programming.dev

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

33

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.

1
sickdayreply
kbin.social

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

9
Ocelotreply
lemmies.world

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

7
programming.dev

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.

16
lemmy.world

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

8

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

2

You reached the end