Worst words heard today: reset has reset to the last head that was pushed to remote
Goodbye three local commits, I’ll miss you
this post was submitted on 25 Jul 2023
115 points (100.0% liked)
Memes
1357 readers
5 users here now
Rules:
- Be civil and nice.
- Try not to excessively repost, as a rule of thumb, wait at least 2 months to do it if you have to.
founded 5 years ago
MODERATORS
git reflog! It gives the history of commits that your HEAD has previously pointed at.
If a rebase goes bad, you can fish out your old HEAD and recover your pre-rebase state.
I tried; unfortunately it was for talend which really bastardized how git is used. And I was unable to make reflog go back. I could see it. I tried to check it out and the ide was sure there was no code to push and that it was on the correct branch still.
Joy of low code tooling. They make the files impossible to work with directly and break and bend text tooling to work in ways it was never designed.
Oh and you have to use their ide which is based on eclipse, and they removed dark mode.
Talend is really terrible.
When I have zero faith in myself I'm not above copying the whole committed file and pasting it.in a dm to myself in slack.
Sometimes you're in a rush and it's good to look after yourself lol.
Also reflog, but the void is calling for code.
Next: Unit tests failed
git diff ...
No differences
Git and ostree
Yes!
I hear ya. I used to be an engineer on an MMO and worked on the patching system. We had to rebase periodically and it was always nice to see it be successful. Lol