Dev russian roulette

The superpower to perform version control on reality. (Git)

Imagine this universe (the current branch), which is made up of a series of events (commits).

Having this ability to allows us to:

- undo events (git reset/git revert)
- reorder events (git rebase)
- transfer to another universe (git checkout)
- derive a new universe from current universe (git checkout -b)
- delete a universe (git branch -D)
- apply an event from another universe (git cherry-pick)

and my favorite:
- merge universes and their events (git merge)

we have to resolve conflicting events, of course.

What else? ;)

Coworker: You've merged the wrong PR. It is broken.
Me: is it marked as broken? Is there a mail marking it as broken?
Coworker: yes. I wrote something in the chat.

Me: 🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕

I do NOT read and click every brain fart from the chat. I had the PR (as reviewer and dependent developer) open on my desk and waited for the coworker to fix his merge conflicts.

OK then, try to revert. Git reset hard. Push -f. Policy does not allow master modification. 🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕

Fuck this company. Fuck the policies. Fuck them all with a chainsaw. Forced me to work 2 weeks more. 17.04 should have been my last day at this circus. Let 3 other guys go to vacation while I have fix their management's mistakes. Fuck. You. All. Eat shit and suffocate in piss.

When suddenly I have no idea what I'm doing with the code

More than half my class: "I prefer the gui from git for Windows to the command line"

The same half: "whoops... How do I revert that?"

My gf was hinting at this, but DAMN that's a lot of ink 😂

GIT LOG VERSION 101
----------------
75fed18 pay no attention to the man behind the curtain
56772ff added security.
6374fdd needs more cow bell
6b27de9 Committing fixes in the dark, seriously, who killed my power!?
bffce8a giggle.
7e93977 Refactored configuration.
e66c495 pgsql is more strict, increase the hackiness up to 11
5690dd9 Revert "just testing, remember to revert"
daa84ba Still can't get this right...
097f164 this should fix it
367f271 GIT :/
f46d735 bump to 0.0.3-dev:wq
b893721 ¯\_(ツ)_/¯
24be0d9 ...
f014a0c ALL SORTS OF THINGS
e648b80 added super-widget 2.0.
3a71628 perfect...
e2a8cb1 Fucking templates.
b08e489 pgsql is more strict, increase the hackiness up to 11

My super power?

"git revert" for real life

That moment when you have refactored so much shit, then really broken the project, but can't see yourself doing a git revert because you had invested so much time and know ultimately it *needs* these changes...

Thank god I fixed it! 😌

Revert the revert commit ...
Our git-tree looks fabulous!

git revert - without knowing how git works

Checked out my college’s robotics team today. I was the only girl in the room, and I feel like I won’t make any close friends like I did in high school. I want my awesome high school robotics team back... 😢

When you delete anything...

Life could have been way better if God has used some version control system and let individual take care of their life.

git revert l@$tHaPP¥d@¥

Or

git reset --hard beginningOfLife

My day:

9 am: crack knuckles, ready to start day

9:01 am: oh, that PR I sent last week hasn't been reviewed yet and I need it in mainline. Better merge latest and get someone to look over it.

9:02 am: now the test suite is broken, better fix that up before getting it reviewed.

1 pm: phew, that was a slog. Now to get on with today actual programming

1:01 pm: "hey buddy, you coming to that tech leads strategy meeting?"

5 pm: Jesus what a meeting. Now maybe I can get a little code written. I'll just fast-forward to latest...

5:01 pm: WHAT DO YOU MEAN THERES A BAD MIGRATION AND EVERYONE SHOULD AVOID USING THE LATEST VERSION WHY DIDN'T YOU REVERT THAT SHIT DO I NEED TO COME OVER THERE AND RESTRICT YOUR STUPID WINDPIPE UNTIL YOU UNDERSTAND GIT *RAGE TABLEFLIP*

I downloaded mr robot. season1-season3. guess what? All of them downloaded in my project folder and I did `git add .` later while working. I was lucky to see it. By now I should've been looking for commit ids to revert.

Worst experience?
Fourth semester. Programming project.
We were 4 persons, I did almost all the work (including fixing the stuff they broke) but that's not the point.

One of them somehow killed our git repo at least once per weak. It was really annoying, because I had to fix it.

Also he named *all* of his commits 'Pfuschpush' (Pfusch is German for botch). And the code had exactly this quality. I often had to rewrite everything he did (or simply revert the commit).

Typical Git work flow on a feature branch:

Commit#1 : The silly feature itself that took 10 minutes to code
Commit#2 : Added unsaved files
Commit#3 : Fix unit tests
Commit#4 : Fix
Commit#5 : Fix
Commit#6 : Fix
Commit#7 : Various Fix
Commit#8 : Added unsaved files
Commit#9 : Merge
Commit#10 : Fixed unit tests
Commit#11 : Code Review tasks
Commit#12 : Revert- Code Review tasks
Commit#13: Refactor part 1
Commit#14: Refactor part 2
Commit#15: Deleted unit tests
Commit#16: Added checking for null
Commit#17: Completely different feature's bugfix
Commit#18: Code review spacing corrections
*Approved*

Trying to merge, then merge conflicts.....

Wondering how many people use git cmd and how many use different git clients.

I regularly use git cmd. I made a transition from clients a while back because I wanted to learn more about how it actually works and it works just fine for me, except when I have to google something I don't remember (like how to revert local commit)

Git clients will for sure do abstraction which can be both good and bad, but I'm wondering if there are any definitive pros for clients.

It's been so long since I used git I accidentally nuked my commit and only copy of client code during a revert.

How the fuck does anyone mess up that badly? 😅

Have you ever got a situation that while working on a CMS (like this Drupal piece of shit), you wake some JavaScript code up?

Lead dev : "Yeah the zoom doesn't work anymore, go and debug it"
Me : "k I'm on it"
*Opens file, start to put 3 or 4 console.log() around to see where things start to break
*it breaks since the beginning why not*
*Starts to play around with variables*
*Result are 'normal'*
*Change edited line to what it was before*
*Code works fine*
*What the hell*
*Git revert /js/script.js*
*Empties cache*
*Code works as it was supposed to do before*

I swear to god I work here since January, this is the 3rd time it happens. Now I'm sure the project has a soul since it stole it from the developers that worked on it before me

How about a Git for Databases?
Do your changes, delete things, create things, and then when you are sure push these changes to your server.
If you did something wrong like accidentally delete fucking everything, just revert and everything is like before again.
Also you can view history and blame people for doing something wrong.

Tell me what you think about this. Not clue how you could implement this tho... Also I have enough to do already so feel free to take this idea!

When working on feature the client requested for two straight days, one that required refactoring few others. Just to hear on the third day, that no, he won't be needing it after all.

It is simple git revert, but still. Two days of work just removed be single command because of incompetent client.

I've been using Git since 2014. So why do I STILL cringe whenever I have to revert commits or do a hard reset back to HEAD? What's going to disappear? What will remain? Will my entire Git history be vaporized? It's a total game of Russian Roulette to me. So, without the certainty level I want, I just do what feels safer...I grab the versions of the files I think are what I need and stick them back into my repo, then git status and commit the correct changes back in.

Rookie me,back when I was making my first Android app...
After a lot of hours put into it, finally finished it...pretty much was ready for deployment...some final touches...but oh wait... I was messing with some files-wanted to delete something and misclicked the whole folder...well my brain farted for a moment and clicked yes-I managed to erase the whole fucking app I was working for months...!
The whole world shut down at that moment! What the fuck did I do?...
In this point I want to thank jetbrains for their magical revert button....
Moral of the story: Learn Git, backup everything and don't be too excited and fuck up tremendously...!

*me discovering esp32*
Wow it's amazing!
i'll get one for my project.

*me working with esp32*
I ported my project to esp32, and.....
Wtf!?! after some time (unpredictable 1sec to N mins) i2c devices stops working. (i2c reset doesn't solve)

I lost several weeks trying to fix that
I felt so angry.

then I realized that it's not my fault
it is a bad implementation of i2c api by espressif.

at this point there is only one thing to do.

throw away the esp32!
(at least for some months waiting for espressif fix)

now i did a git revert and switched back to arduino.
now everything works and it's an awesome sensation!

Sitting in a bar with a senior colleague (Me - Student part timer, Him - 15+ Years of experience).
We started talking about our projects and he mentioned that after this, he'd get to spend his evening fixing a git merge, which went wrong because one of his teammates used cherry pick and thus messed up the history a bit (oversimplified).
So he tells me he'd be spending hours to get an overview of his colleagues codes (multiple devs and only team leader knows who does what exactly).
So I suggested he revert these cherry picked commits and so could maybe solve the problem in less time.
He thought about it... Told me HE didn't think of that and thanked me for my help.

Long story short: Today was a good day :3

I have a confession to make..

When I screw up and want to revert to the last commit, but I don't understand the gibberish error text that git shows me, I just delete the local copy and clone the one on the main repo.

My code was replaced with "return null". I caught it ten minutes before demo.

I get that reverts happen - I just wish somebody told me! Git power user for the win! I revert your revert sir!

We had one group project where we made game. We had like 3 developers, one guy to do some artwork and one to do most of the project management. And at that point in the project I had done most of the work so far (but not because the others didnt do anything, I just had fun coding).

One day said artwork guy managed to accidentily revert 100 of my commits without even opening a single code file. He didn't know git and issued random commands. I wouldn't know how to fuck up a repository like that even if I wanted to. Usually I am rather calm but at that point I was a little bit pissed.

FML..

I worked directly in my Github repo folder while working on a project (don't ask me why). I did my initial commit with all my code from the start until 5 hours ago. I never pushed.. A minute ago, I checked my commit and noticed that there were DB credentials in one of the files. So.. Smart me.. "revert commit"..

Result. Everything got deleted except my node_modules folder and the readme file.. I lost everything.. Fuck me, I'm going home..

Please, someone.. Can I get these files back via git or something? Can't find anything in in the history..

New to working with git in a large scale application. I've used it in personal things, but not at an enterprise scale.

"genius" me: git pull origin {{dev branch name}}
"genius" me: why won't any of these tests work?
"genius" me: spends 2 hours working on fixing some tests

actual genius that I work with: Dude, revert that shit and pull from master, the tests will work. Don't pull from {{dev branch name}} because you have no idead what might be there.

This makes sense. Things are started and abandoned in favor of new priorities all the time. At least my PM is pretty cool and didn't freak out that I wasted that couple of hours like at a previous position.

Also, git is far superior to mstfs. Very smooth and easy to use once you get the hang of it.

This was sadly recent. I have git checkout aliased to ‘gco’.
I was on a dev branch with a load of uncommitted changes, and I accidentally ran ‘gco ..’ instead of ‘cd ..’ (I use them both quite often)

That was one of my more frantic google searches.....

Thankfully I was able to get all my changes back, but only thanks to IntelliJ’s local history feature allowing me to revert each file reload from disk.

need an auto correct for life, on reasonable notes I will manage with git revert also, but need atleast one of these

You want to re-merge a branch after a previous merge has been reverted on the mainline branch?

That's easy! Just revert the revert commit and then merge again. Because logic.

I need some help. I have a 1 months old MR in gitlab with 5 commits of a feature that I have to revert.

I have hard time understanding how to solve git revert conflicts and frankly this three windows GUI on intellij idea is very confusing to me. I am like afraid that I will accept a bad change or miss something.

Is there any other way to make this merge conflict solving easier? I was thinking maybe I could just rebase to head where I added my commits, revert them without conflicts and then rebase that branch on latest develop?

In that case I would be solving merge conflict by adding stuff instead of removing old stuff and being afraid that I will mess up something. Goal is to create a revert feature MR.

Is there any git gui that allows to revert just one file? Gitkraken is amazing but really sucks outside of basic git operations

i just learnt how much clearcase sucks the hard way. i always used git for personal projects and am used to finding a simple solution to any problem at most one stackoverflow away, i just messed up my local repo, and experienced people could not manage to undo it. i mean come on, this is a f**king versioning software, how hard can it be to delete everything local and re-pull from remote without messing up configuration files? either clearcase has some serious design shortcomings for my understanding of a versioning software, or it is so overly complicated that nobody actually knows how to revert this mistake.

Sitting at my desk, happy tapping away at code, and one of our newer team members asks a general question (4 of us in the office)....

"Uh.. how do I undo a git revert?"

🤔🤦

FML... Very much looking forward to leaving this place next year.