Long rant ahead, but it's worth it.

I used to work with a professor (let's call him Dr. X) and developed a backend + acted as sysadmin for our team's research project. Two semesters ago, they wanted to revamp the front end + do some data visualization, so a girl (let's call her W) joined the team and did all that. We wanted to merge the two sites and host on azure, but due to issues and impeding conferences that require our data to be online, we kept postponing. I graduate this semester and haven't worked with the team for a while, so they have a new guy in charge of the azure server (let's call him H), and yesterday my professor sends me (let's call me M), H and W an email telling us to coordinate to have the merge up on azure in 2-3 days, max. The following convo was what I had with H:

M: Hi, if you just give me access to azure I'll be able to set everything up myself, also I'll need a db set up, and just send me the connection string.
H: Hi, we won't have dbs because that is extra costs involved since we don't have dynamic content. Also I can't give you access, instead push everything on git and set up the site on a test azure server and I will take it from there.
M: There is proprietary data on the site...
H: Oh really? I don't know what's on it.
<and yet he knows we have no dynamic data>
M: Fine, I'll load the data some other way, but I have access to all the data anyway, just talk to Dr. X and you'll see you can give me access. Delete my access after if you want.
H: No, just do what I said: git then upload to test azure account.

Fine, he's a complete tool, but I like Dr. X, so I message W and tell her we have to merge, she tells me that it's not that easy to set it up on github as she's using wordpress. She sends me instructions on what to do, and, lo and behold, there's a db in her solution. Ok, I go back to talking to H:

M: W is using a db. Talk to her so we can figure out whether we need a database or not.
H: We can't use a database because we want to decrease costs.
M: Yes I know that, so talk to her because that probably means she has to re-do some stuff, which might take some time. Also there might be dynamic content in what she's doing.
H: This is your project, you talk to her.
<I'm starting to get mad right now>
M: I don't know what they had her do apart from how it interfaces with what I've done.
H: We still can't have databases.
M: Listen, I don't do wordpress, and I'm not gonna mess with it, you talk to her
H: I won't do any development
<So you won't do any dev, but you won't give me access to do it either?>
M: Man, the bottleneck isn't the merging right now, it's the fact that W needs a db
H: I know, so talk to her
M: THE RESTRICTION TO NOT HAVE DATABASES IS NOT MINE, IT'S YOURS, YOU TALK TO HER. I can't evaluate whether it's a reasonable enough reason or not since I don't know the requirements or what they're willing to spend.
H: It's your project.
M: Then give me fucking access to azure and I'll handle it, you know you'll have to set up wordpress again regardless whether we set it up the first time.
H: Man just do your job.

At this point I lost it. WHAT A FUCKING TOOL. He doesn't wanna do dev work, wants me to go through the trouble of setting up on a test subscription first, and doesn't want to give me access to azure. What's more, he did shit all and doesn't want to anything else. Well fuck you. I googled him, to see if he's anyone important, if he's done anything notable which is why he's being so God damn condescending. MY INTERNSHIP ALONE ECLIPSES HIS ENTIRE CV. Then what the fuck?

There's also this that happened sometime during our talk:

M: You'll have to take to Dr. Y so he'll change the DNS to point to the azure subscription instead of my server.
H: Yea don't worry, too early for that.
M: DNS propagation takes 24 hours...
H: Yea don't worry.

DNS propagation allows the entire web to know that your website is hosted on a different server so it can change where it's pointing to. We have to do this in 2-3 days. Why do work in parallel? Nah let's wait.

I went over his head and talked to the professor directly, and despite wanting to tell him that he was both drunk and high the day he hired that guy, I kept it professional. He hasn't replied yet, but this fucker's pompous attitude is just too much for me alone, so I had to share.

PS: I named his contact as Annoying Prick 4 minutes into our chat. Gonna rename him cz that seems tooooooo soft a name right now.

For our 4 programming tasks we had to use Git. Which i fully support, except whenever one of my group members made a change she would commit min 8 times and the message would be "change". Even after mentioning to her that she should write What she changd she just changed it to: "change filename". I mean yeah, i can clearly see which file you changed but come on, WHAT in the file did you change. While doing this she also managed to overwrite my changes or completly delete my files forcing me to constantly restore shit 😐

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? ;)

IntelliJ IDEA just saved my ass!
I tried deleting a resource file I had staged, but not commited yet.
A dialog comes up asking to delete alternative configs with "Yes" as the default.
Boom! After I braindead hit the enter key all other files vanished too!
I checked Git and saw to my horror that the files were also not tracked anymore.
I hastly lookup the last backup timestamp - an hour ago - fuuuuu!
I just lost about an hour of work.
I was about to give up and start from scratch when I look at the edit menu in my IDE.
Turns out you can actually undo multiple file deletions!
Kudos to the girls and boys at JetBrains! You saved the day! 😙

Git Pull Failed, Merge Conflict.

Me:
don't do it
don't do it
don't do it
don't do it
don't do it
don't do it
don't do it

Me:
Delete local project folder and pull the project down again.

Delete .git folder after I fucked up the branch

TFW your client's git policies are so draconian that the dev teams use "develop" as trunk, and completely ignore the release process.

I wrote up 50 pages of git standards, documentation and procedure for a client. Bad indian director 9000 decides the admin (also Indian) who specializes in Clearcase and has no git or development experience is more qualified to decide and let's him set the policy.

FF to today:

- documentation, mostly contradictory, is copy pasted from the atlassian wiki
- source tree is the standard
- no force pushing of any branches, including work branches
- no ff-merge
- no rebasing allowed
- no ssh, because he couldn't figure it out...errr it's "insecure"
- all repos have random abbreviated names that are unintelligible
- gitflow, but with pull requests and no trust
- only project managers can delete a branch
- long lived feature branches
- only projects managers can conduct code reviews
- hotfixes must be based off develop
- hotfixes must go in the normal release cycle
- releases involve creating a ticket to have an admin create a release branch from your branch, creating a second ticket to stage the PR, a third ticket to review the PR (because only admins can approve release PRs), and a fourth ticket to merge it in
- rollbacks require director signoff
- at the end of each project the repo must be handed to the admin on a burned CD for "archiving"

And so no one actually uses the official release process, and just does releases out of dev. If you're wondering if IBM sucks, the answer is more than you can possibly imagine.

My graduation project partner was strange person

Favorite IDE is VIM

Forget how to use git

But somehow she could code most of the app

I asked what does she do when mistake happens, she answered "delete and write again"

I suggest github but she is "to embarrassed to show her code on internet"

She send .zip file of her code to me

Go to univ library to copy some code because she don't believe random code on internet

Of course verson of code on book in library is too old, but she prefer fix herself

But she is overall good person, so I can graduate next month

!rant.
Here's some useful git tricks. Use with care and remember to be careful to only rewrite history when noones looking.

- git rebase: powerful history rewriting. Combine commits, delete commits, reorder commits, etc.

- git reflog: unfuck yourself. Move back to where you were even if where you were was destroyed by rebasing or deleting. Git never deletes commits that you've seen within at least the last 50 HEAD changes, and not at all until a GC happens, so you can save yourself quite often.

- git cherry-pick: steal a commit into another branch. Useful for pulling things out of larger changesets.

- git worktree: checkout a different branch into a different folder using the same git repository.

- git fetch: get latest commits and origin HEADs without impacting local braches.

- git push --force-with-lease: force push without overwriting other's changes

Commit Message Part2:
6528fff Code was clean until manager requested to fuck it up
241b35f Who knows WTF?!
4381a32 Argh! About to give up :(
c3bf1a9 more debug... who overwrote!
2d68d6d Fixed a bug cause Maciej said to
b112c1a This branch is so dirty, even your mom can't clean it.
bb456d4 Shit code!
4878b46 Copy-paste to fix previous copy-paste
e2c7e87 A fix I believe, not like I tested or anything
f56109f derpherp
e4b8f4c formatted all
3691208 I'm just a grunt. Don't blame me for this awful PoS.
0888b69 just checking if git is working properly...
62741aa I'm too old for this shit!
0735196 COMMIT ALL THE FILES!
09caccf I CAN HAZ PYTHON, I CAN HAZ INDENTS
1e1cda8 giggle.
ab70bde Fixed errors
934436d Now added delete for real
5f84e30 My bad
99baff8 CHRIS, WE WENT OVER THIS. C++ IO SUCKS.
953473d final commit.
f0c3b57 Just committing so I can go home
4e5ce4e yolo push
deb4e3b I CAN HAZ PYTHON, I CAN HAZ INDENTS
710c06a Commit committed....
3c45e67 it is hump day _^_
4487788 Committing in accordance with the prophecy.
bf86e7e This solves it.
4804f68 FONDLED THE CODE
051d42e REALLY FUCKING FIXED

What an absolute fucking disaster of a day. Strap in, folks; it's time for a bumpy ride!

I got a whole hour of work done today. The first hour of my morning because I went to work a bit early. Then people started complaining about Jenkins jobs failing on that one Jenkins server our team has been wanting to decom for two years but management won't let us force people to move to new servers. It's a single server with over four thousand projects, some of which run massive data processing jobs that last DAYS. The server was originally set up by people who have since quit, of course, and left it behind for my team to adopt with zero documentation.

Anyway, the 500GB disk is 100% full. The memory (all 64GB of it) is fully consumed by stuck jobs. We can't track down large old files to delete because du chokes on the workspace folder with thousands of subfolders with no Ram to spare. We decide to basically take a hacksaw to it, deleting the workspace for every job not currently in progress. This of course fucked up some really poorly-designed pipelines that relied on workspaces persisting between jobs, so we had to deal with complaints about that as well.

So we get the Jenkins server up and running again just in time for AWS to have a major incident affecting EC2 instance provisioning in our primary region. People keep bugging me to fix it, I keep telling them that it's Amazon's problem to solve, they wait a few minutes and ask me to fix it again. Emails flying back and forth until that was done.

Lunch time already. But the fun isn't over yet!

I get back to my desk to find out that new hires or people who got new Mac laptops recently can't even install our toolchain, because management has started handing out M1 Macs without telling us and all our tools are compiled solely for x86_64. That took some troubleshooting to even figure out what the problem was because the only error people got from homebrew was that the formula was empty when it clearly wasn't.

After figuring out that problem (but not fully solving it yet), one team starts complaining to us about a Github problem because we manage the github org. Except it's not a github problem and I already knew this because they are a Problem Team that uses some technical authoring software with Git integration but they only have even the barest understanding of what Git actually does. Turns out it's a Git problem. An update for Git was pushed out recently that patches a big bad vulnerability and the way it was patched causes problems because they're using Git wrong (multiple users accessing the same local repo on a samba share). It's a huge vulnerability so my entire conversation with them went sort of like:

"Please don't."
"We have to."
"Fine, here's a workaround, this will allow arbitrary code execution by anyone with physical or virtual access to this computer that you have sitting in an unlocked office somewhere."
"How do I run a Git command I don't use Git."

So that dealt with, I start taking a look at our toolchain, trying to figure out if I can easily just cross-compile it to arm64 for the M1 macbooks or if it will be a more involved fix. And I find all kinds of horrendous shit left behind by the people who wrote the tools that, naturally, they left for us to adopt when they quit over a year ago. I'm talking entire functions in a tool used by hundreds of people that were put in as a joke, poorly documented functions I am still trying to puzzle out, and exactly zero comments in the code and abbreviated function names like "gars", "snh", and "jgajawwawstai".

While I'm looking into that, the person from our team who is responsible for incident communication finally gets the AWS EC2 provisioning issue reported to IT Operations, who sent out an alert to affected users that should have gone out hours earlier.

Meanwhile, according to the health dashboard in AWS, the issue had already been resolved three hours before the communication went out and the ticket remains open at this moment, as far as I know.

**Overheard new intern struggling with git talking to lead developer

Intern: "I am having trouble with the git repo on my local machine, can you take a look?"

*** Looks at code for three seconds

Lead developer: "Yeah, I suggest you just delete and reclone the repo."

“Don’t learn multiple languages at the same time”

Ignored that. Suddently I understood why he said that. Mixed both languages. In holiday rechecked it and it was ok.

Sometimes mistakes can lead to good things. After relearning I understood it much better.

“Don’t learn things by head” was another one. Because that’s useless. If you want to learn a language, try to understand it.
I fully agree with that. I started that way too learning what x did what y did, ... But after a few I found out this was inutile. Since then, I only have problems with Git

Another one. At release of Swift, my code was written in Obj-C. But I would like to adopt Swift. This was in my first year of iOS development, if I can even call it development. I used these things called “Converters”. But 3/4 was wrong and caused bugs. But the Issues in swift could handle that for me. After some time one told me “Stop doing that. Try to write it yourself.”

One of the last ones: “Try to contribute to open source software, instead of creating your own version of it. You won’t reinvent the wheel right? This could also be usefull for other users.”

Next: “If something doesn’t work the first time, don’t give up. Create Backups” As I did that multiple times and simply deleted the source files. By once I had a problem no iOS project worked. Didn’t found why. I was about to delete my Mac. Because of Apple’s WWDR certificate. Since then I started Git. Git is a new way of living.

Reaching the end: “We are developers. Not designers. We can’t do both. If a client asks for another design because they don’t like the current one tell them to hire one” - Remebers me one of my previous rants about the PDF “design”

Last one: “Clients suck. They will always complain. They need a new function. They don’t need that... And after that they wont bill ya for that. Because they think it’s no work.”

Sorry, forgot this one: “Always add backdoors. Many times clients wont pay and resell it or reuse it. With backdoors you can prohibit that.”

I think these are all things I loved they said to me. Probably forgot some.

A day in the life of BoyBiscuit.

PM: Please zip up any local changes and push them to a temp folder on the repo and I will manually check to see what you have changed.
Me: *glaring at the download as zip button*

PM: Who broke the repo?
Me: *checks commit history*
Commit History: *last commit PM*

Me: Could you add the files to your commit before pushing because you've only pushed changes on tracked files.
PM: No not possible, I did 'commit -a'.
Me: ....

PM: Could you all delete your forks so that It isn't anywhere on the web
US: but it's private with only us as collaborators
PM: No because I can see it
Me: srysly?

PM: Could everyone try to write more effective code?
Me: Looks at his code
Code: Boolean b = getbooleanVal ? True : False;

Tl;Dr: PM doesn't know anything about git or working as a team.

See you tomorrow!

Inner Me: Where the fuck is this bug coming from
> Set a breakpoint in every single place where the method I'm using is being called.
> Try calling the method before every function call
Inner Me: FUCKING DAMNIT! It's been hours now
Inner Me: No way it's the library I'm using.
Inner Me: That couldn't possibly be the problem
> Try running it again and delete some more shit
Inner Me: FUCK MEEEEEEEE
> Getting delirious
> Begin to look at some stupid memes.
> Come back to it.
> Have an Ah-ha moment
> Try running it again but rearrange the order of the method calls
> Still no luck
> try git stashing a bunch of my changes
> git stash apply them back
> erase the method call entirely
Inner Me: well that sort of worked, but now all my numbers are incomplete
Inner Me: FUCKING FINE!!! I'LL LOOK IN THE GODDAMN LIBRARY
Inner Me: FUUUUUUUUUUUUUCCCCCCCCKKKKK a stupid integer casting was occuring to my floats!!!

Now Talking to my girlfriend.

Me: The problem was in the library I was using
Girlfriend: How are you going to fix it if it's in the library?
Me: ... I can, because I wrote the library...
Me: FUCK ME RIGHT?
Me: I guess moral of the story; sometimes the problems starts with ourselves
GF: Hahaha. Thats Deeep

I'm writing my bachelor thesis in LaTeX. As people who use LaTeX might know, it generates shitloads of files while compiling (like 10 files per .tex file).
To unclutter my project folder, I wrote a simple one-liner bash script that deletes all files which are not .tex or .bib files (literature references) and of course it will not delete itself (although that one also took me longer to figure out why my script 'kept disappearing for no reason after I ran it' than I'd like to admit).

However, I forgot that images are also files which are stored in the project-folder.
And this is how I suddenly lost all of my images for no reason at all, resulting in my PDF not building anymore. Luckily we all commit and push all regularely, right...

Edit: I just figured out that I'm even stupider than originally thought... My .gitignore ans more importantly, the '.git' folder also neither end in .tex nor .bib. Guess I'll just go fuck myself.

Me: How can I delete pushed commits from origin?
Colleague: Just do git reset --hard and then git push -f
Me: But this is dangerous
Colleague: Wait, I'll do it myself
Colleague: Done
Me: But nothing happened
Colleague: Fuck. I just removed all changes on my own branch

CEO at work has a Mac elitist as a friend who somehow indoctrinated err I mean convinced him to get apple everywhere, now the most common issue is updating Microsoft products on the Mac.....

Mac elitist guys first name is Steve lol no lie, he also services the Macs which he expects to do so when no one is around, oh and did I mention he wants us to leave our passwords on our desks LOL, he doesn't work for the company and I really really don't trust him, glad I have a git repo, and I hope he doesn't delete anything on my PC (very reluctant to leave my password on my desk, so I may just convince everyone that my Mac is fine, which seems like it's doing it's thing)

So this just happened. I was working on a project and I just found a weird directory named '~' in there. I am on Linux so I simply did an "rm -rf ~" :/

It was too late when I realized it deleted all my files in my home directory. All my projects and configuration files. The sad part was it did not delete that shitty random directory because permission denied. Thank God I got into the habit of making weekly backups of my system and Thank God I use git.

I've seen many devs doing crazy things in my entire career till now. But this one dude stands out.
He used to:
- Push binaries to git repo
- Use some old libraries which were used during Indus Valley civilization
- Had no sense of database and used to delete random data from it and call it as TESTING (Thank God! I never gave him prod access)
- And on top of this, he had an ass full of attitude!

An intern came to us with a build issue, it was very difficult to pin point the cause of issue as there were many modified files in the project. So to figure out the cause one guy git stashed lot of fiiles. Now, intern being not aware of the git stash command thought that all his changes are deleted. The way he freaked out thinking all his changes were lost was amazing. Also other people jumped on the bandwagon, and started questioning the developer that how can you delete the changes of an intern. It went like this for 10 min and finally we told the intern that his changes are safe.

From fresh experience, IF you are learning Git I would really suggest you fully learn it from a professional before really using it. So you don't accidently delete 1,5 weeks of work like I just did :))))))))))))

Stopid mf fat fingers, worked 2 weeks building a design system and 2 hours ago I accidentally shift deleted the scss folder and lost every fcking file, no git, no backup, no nada,guess what, tried to recover the files with 2 Permanently deleted file recovery softwares and from fcking 20 files, 17 were corrupted and weren’t readable, I and my designer friend use a folder sync app, the fcking app synced the delete and she lost the files aswell, fooockiinggg shieeeet, to my don’t know how where luck I managed to recover the copiled javascript chunck from my vue app that had the css styles embeded in the file, you know where I found the js file? iN ThE fcking cache of google chrome. Today I almost broke down to tears, but nonetheless it was a reeee moment for me.

My NDA prevents me of revealing a lot but here we go...

Hi,
during a 2 year hiatus after High School I decided to study CS. Coming from a third world country with no prospect of getting a nice job without breaking my back or getting spit on by overconfident CS geeks who now actually make a living wage there, I decided to study abroad.

I immediately realized what I have been missing... the culture, the people, the happenings,... I have been starved of LIFE

Anyways, I got the language pretty much down, uni is pretty hard but doable and I got the unthinkable... A JOB. I am currently a working student for a year at a multimillion dollar global conglomerate, doing what some may think of as scripting/data tinkering. I get payed more than both my parents combined, which is why they don't know anything... 😂 (yet, gotta ease em into it).

Now I have gotten my contract extended, which shows that I am doing a decent job there, the boss is firm but chill, coworkers are helpful and resourceful.

But what really grinds my gears is that I am mashing code together whilst googling my brain out, but I am not gaining any skill...

Now comes my grievance, the bane of my existence, the evil Morty to my Morty,... GitHub.

In this professional surrounding, where I got handed a $2,5k notebook and a overly huge paycheck, I never use Git (because we have a proprietary, internal, and very transparent alternative (transparent for the higher ups 😬 ))

I always wanted to contribute on GitHub, but I get very intimidated by the projects there and their scopes, people are waaay too knowledgeable in comparison to me and I will most certainly screw something up and embarrass myself. Since I am very self-conscious and awkward I would most probably just delete my profile there and lurk in the shadows again.

I need help, not only for my mental health, but also to expand my skillset and improve myself, since skill is the only thing I can still acquire.

Does anyone know where I should start as a overglorified python script-kiddy who still thinks 1337 is cool and mr Robot is a decent show?

Thanks,
@rn

When you delete anything...

new git alias :
mergetool : rm -rf .
just delete all conflicts in code

...5 minutes ago per ssh on the productivity server...

"ok, let's delete this old test directory ..."
*types rm -r www*
....*thinking* ...*realising* ... "FUUUUUCK!!11"
*quickly types git clone gitadress"
*checks website* "phew!"

Why the hell do I have to keep showing everyone on my team how to use git. Learn it God dammit!!! Is not that hard. How come you freak out on a simple conflict? Why don't you delete your fucking merged branches?

How to delete 16 days of commits 101 🤯:

First of all, me and my class (computer science in college) were working on a project for around 12 weeks, our “client” is one of our teacher and we literally just finished today to work on the project since our degree terminal projects are starting next week.

So now there's this guy in our class who kinda has the reputation to be stuborn and clumsy; he’s going to do his assigned task, commit, push it and put his task into QA (which is just peer evaluation and testing nothing really complex) and then when we try his functionality and finds out it isn’t working, we tell him and the only thing he always answers is : “but it works on my machine” and then we will need to explicitly ask him to be sure he has all the latest changes (database and codebase) and to see if it still works on his side since it doesn’t work for anyone else.

This actually happened quite a lot in these 12 weeks and you can definitely imagine that of course it would definitely not happen again today when we thought we were finally done with this project…

So another teacher gave us an assignment to create a development environment for our big project so we could try out Docker instead of virtual machines, he made GitHub Classroom repos with a minified version of our project and up to this point everything is fine and clear. That is until 3 hours ago, that our little clumsy friend somehow pushed his Docker related files on the main project, maybe he was trying his Docker setup on the real project no big deal you know EXCEPT IF HE HADN’T NOT PULLED SINCE 16 DAYS 😤.

He was doing maintenance on another project so I can maybe understand but gosh how did he not see the big warning of Git that he wasn’t up to date with master ? And yes we only have a master branch bear with us but hopefully we were able to create a new branch with the up to date project and then merge master.

A couple of us had a gut feeling that this guy would do something that would break the whole project right before we ended, turns out we were right 😅

So on a scale from 0 to creating a bat script to delete folders and fully re clone the repo's you just deleted because you can't be bothered learning git, how lazy are you?

I'm in the latter...

Reminiscing the days before Mercurial and Git,

1) I delete foo.cpp.
2) I tell Subversion to delete foo.cpp from repository.
Subversion: Error - can't delete file because it doesn't exist locally.
3) I create some dummy foo.cpp.
4) Again, I tell subversion to delete it.
Subversion: Error - can't delete file because it exists locally.

Every time I get angry with Git (strangely never happens with Mercurial), I remind myself what Subversion was like.

I think the reason why git beginners have a hard time with it is because the api is a bit untuitive.

For example: if you want to "unstage" staged changes, you run git reset, and if you want to "delete" those changes from your working copy, you git checkout those files.

But then, you find out that you can do all of that if you git add . and git reset --hard.
So you're like "huh..."

And then you discover that if you end the resethard with a branch name/commit id then you also make current branch point to the commit or that branch/commit (respectively).
So you're like "huh..."

And also if you add a commit id or branch name to git checkout, you change the current branch to specified/enter detached state with HEAD pointing to that commit (respectively).

Oh and you don't use git branch to create branches, you use git checkout -b because it's a lot shorter.

So here's a rundown: git reset mutates things related to files, but also mutates things related to branches.
git checkout also mutates things related to files and mutates things related to branches too (in a diff way). Also, creates new branches.

I don't think this is intuitive. We users use the same commands for different purposes with just a different flag.
Commands shouldn't mutate different types of things. But don't composite commands (as in, "smart" commands that mutate different things) shoudln't be a flag in an existing command, it should be a single new command of its own.

Maybe if I reread the internals of git now, I'll be able to disgest the dozens of technical terms they throw at you (they are many). And in my mind, the api will cognitively fit to the explanations.

Here's another one that feels weird too.
If you want to make your changes start on top of someone else's commit, you do git rebase.
But git rebase -i can be used for that, and also to delete, modify changes or message of, reorder or combine previous commits of the current branch.

Maybe the reason why several things we do overlap with the same commands is because they internally do similar things, and while not separating those commands might make it less intuitive, it makes them more sensible? i dunno...

disclaimer: I'm not setting this opinion in stone though, and am aware that git was created by one of the most infuential programmers.

Just delete the whole local repo and clone again!

(He definitely didn't know about git reset --hard head)

Well... I once accidentally deleted a classmates entire assignment. Basically we were working together on one and we had the code in Github, I had named the repo after the module code.
He was having some weird git issues and I thought it would be easier to just delete and re-clone on his machine. You can probably see where this is going.

Me: rm -rf <DIR NAME> Enter
Him: wait, which folder did you just delete

Turns out he had the repo cloned inside another directory with the EXACT SAME NAME, which also contained his previous assignment, the only copy of it in the entire universe (it was a group project and they did it all on his laptop with no source control, which i found hilarious).
It wasnt so bad since that assignment was already submitted and graded, but a bit of a fail on both our parts.

My .pryrc and a Ruby script it loaded (in another directory) both disappeared seemingly without cause. I lost days of work including a bunch of debugging and performance utilities I wrote over the past year.

But I have no clue how this happened. Neither the .pryrc file nor the script’s folder are tracked by git, so it wouldn’t have been deleted, overwritten, stashed and dropped, etc. None of the other dot files are missing, and the folder is still present, albeit with one fewer files. I wouldn’t delete them, and commands that would delete them do not appear in my zsh history. So I’m at a loss. Figuratively and literally.

They’re just. Gone.

Is there any way to recover missing files on OSX?

I never thought I’d need a backup solution for local scripts.

I remember the first time I was experimenting with Linux and decided to install Kali Linux (was still version 1 at the time) and in the process cleaned my hard drive. I was in first year and I hadn't been introduced to git, so you can imagine what happened to my code.

Or when I dumped all my databases into one SQL file (the feature looked tasty in phpmyadmin) and then after reinstalling everything, I couldn't import back the files.

Or last year, where I was on industrial attachment. So we were to delete some data from DHIS2 manually. So as a developer I grouped all organisation units to be deleted under one parent and wrote a python script to recursively delete anything in that group. Just when I was about to show my supervisor how efficiently my script was deleting stuff, he said, "Don't delete anything yet". I hope he doesn't read this *wink*

Fast forward, last week on Friday I dropped my external hard drive. It just works on one USB port now, no idea how and why.

It all started when I commited my server password without noticing...

TL;DR: Reinstalled the server, delete + recreated the git repository 😢

Cleaning up after yourself if so damn important. Even your git repos:

# always be pruning
git fetch -p

# delete your merged branches
git branch --merged | grep -v master | xargs -n 1 git branch -d

# purge remote branches that are merged
git branch -r --merged | grep -v master | sed 's/origin\///' | xargs -n 1 git push --delete origin

Make micro level Git commits and push. Don't delete your branch until it goes to prod. Never.

Tarball of source code from a big manufacturer served on their open src page...
They forgot to delete the .git subdir!
Private keys and signing tools for everybody!!!!

P.S It's fixed by now, don't get your hopes up :P

Getting a new laptop tomorrow, and was planing the process of setting it up.

Steps for new windows computer
1. Delete all included software... all of it.. call an exorcist if needed. Cast out the demons. Seriously, fuck you norton, and fuck you mcafee.

2.Use Edge to download ANY other browser.

3.edit system files to disable Edge, because fuck Edge.

4.install linux subsystem.

5.intall linux software like git, and use git to restore rc files.

6.party all night (code)

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!

*sends email to ops manager to explain nuget & git (yes, he is THAT guy)

*his reply "what's nuget?"

Ooooooooh! Why don't you open Google and do a fucking search you amazingly stupid twat!!! In what fucking era do you live in? What the fuck are you doing at work everyday, besides complaining about how time consuming your useless mundane tasks are? Take some of your undeserved salary and go educate yourself, you useless sack of shit! FUCK!

*meanwhile... Little grin on my face. *Shift+delete email.

People who delete a repo and clone again instead of a hard reset because 'they can't undo the changes they made" are the kind of people who shouldn't be using git in the first place.

let me preface with the fact that I'm now known at my new job for being the resident cli hipster. I can't lay any claims to knowing if it's "better" but I like it, I don't care if you do or don't, it just works for me and my flow

so at my job, we generally squash all our commits into one commit and delete the source branch upon merging; i accidentally committed all my work to an old, already merged branch, so my boss tells me it would be more of a PITA with the weird references we would encounter by merging the branch again, rather than just cherry pick the commits into a new branch, which i'm like "eh, fine.".

HIM: "You want to share your screen so we can resolve this?"
ME: "k"
HIM: "Oh, you won't be able to do this in a terminal, you are going to have to load up a GUI of some sort"
ME: "lawlz, no you don't"
HIM: "i highly doubt you will be able to accomplish that, but if you wanna make an ass of yourself, i'll humor you"
ME: "yeah, watch this"

> git log > log.txt
> git checkout <new branch>
> git cherry-pick <copy-paste-full-commit-hash-here>
> git push

ME: "done"
HIM: "what? there's no way you did it that easily, where are all your other commits???"
ME: "i usually try to amend my commits since we squash them anyhow. it really helps in situations like this"
HIM: "well, you go girl"

roll that up in your fancy degree and smoke it, why don't ya?

So I made a repo to have a template to initialize node projects.
I copied the folder to a new folder and found all commits where there but I wanted to start fresh.

Quick googling on how to just start fresh ... then I realized I might just delete the .git folder, see what happens.

Then BAM! All fresh,
git init
git add .
git commit -m "first! Template set"

Life is easy sometimes.

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...!

Ok. that made a full circle.

I needed for ONCE to manually do git things.

(There is a plugin in V which wil lrecompile SCSS to CSS if CSS file is deleted, I want to comit delete).

WHY DO I HAVE VIM ON MY WINDOWS ????

And most importantly, how do I exit it ?

Ok finally, I can tell now.

There's a college project I'm in with 2 more people that uses Python and AnyLogic (separately).
We also need to write some LaTeX, so as I was already using PyCharm for the Pyshit, I used it for the LaTeX and for Git.
I used it for Git too because I didn't know how it used Git and was worried that if I used the console it didn't recognize something or glitched out or something. And what the hell, it's a mature IDE, what could be so hard or possibly go wrong?

I had to re download the repo a couple of times because between pushes, pulls, merges and commits something happened and the repo ended in a weird state.
These are all the things I do:
Add, commit, create branches, merge, push, pull and delete branches.

So, I hadn't opened in some time. The last time I tried to bring something from another branch, and stayed up late to finish something. I was waiting for my classmates to join the call when I thought something like "Hey, I should commit what I did until now, it worked great.". When I examined the IDE I found out I was in the middle of a rebase or something. I start clicking buttons to at least try to commit. I press "Skip Commit". I lose everything.

What the fuck‽ As you can see in the comprehensive list above, I never do something similar to a rebase. Apparently when I tried to merge a couple of branches, the stupid IDE thought I tried to do a rebase and never asked me to finish it. Why do something I have never asked? Plus, why haven't you prompted me to finish the operation? That's so stupid. I'm never trusting IDEs again.
I was so lit for losing so many hours of work I did a couple of weeks before, I would have to think it and do it all over again because of something I never asked.

We spent an hour looking for a way to recover the lost code.
Why an hour, you ask, if you can use the Local History for that in PyCharm?
Because none of us had used it before and the articles we found said that you had to open it from the toolbar. From the toolbar it was greyed out.
Then I found the option in the contextual menu of the files. Recovered the LaTeX files but on the AnyLogic files, it was greyed out.
I had to open the Local History of the folder containing the AnyLogic file.
And that was that.

I almost faint.
Fuck Python, fuck PyCharm.

Best and worse IDE feature for you.
Me :
IDE : VS2019
Best : Conditional break points (cf image)
Worst : Git branches management (For example : can’t delete multiple branches at the same time)

Git Commit Part 3:
28d48b0 This is why the cat shouldn't sit on my keyboard.
95df68f I must enjoy torturing myself
c5acfc2 Fix my stupidness
3a57702 I hate this fucking language.
6cb212a Too tired to write descriptive message
292b1e2 That last commit message about silly mistakes pales in comparision to this one
f4a091f Does not work.
5af1ca1 small is a real HTML tag, who knew.
e7d2d84 Best commit ever
f54d32b de-misunderestimating
f587ca1 Added translation.
352e29c Future self, please forgive me and don't hit me with the baseball bat again!
54403a6 Now added delete for real
9f42f38 Who knows...
5df8457 more ignored words
56bd0ef Added missing file in previous commit

This is git.

You code whatever, add the files, commit and push.

Just keep doing at repeatedly.

Until your push is rejected, in which case you delete the local folder and re-clone the whole thing.

#howOneLearnsGit

So this happened at a government organised 24 hour Hackathon. We had to store documents uploaded from the front end. Now we’ve been trying for a very log time but everything failed (yeah we had a crappy front end guy). Then all hell broke loose when the our team leader in hi sleep deprived state deleted our git repository while I wondered why my pushes were throwing a 404. When hell felt near we came up with the solution to encode the documents in base64 and store it in the database since we only had to show a demo😂.
Sadly enough, WE LOST. Although in retrospect it comes as no surprise.

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.

Lesson learned. As a newbie to git and vcs in general, always verify a rebase to make sure you didn't accidentally delete your last days work before force pushing and overwriting the company repository. Also, don't get into a situation where you need to do that in the first place.

That feeling when u delete 4months of coding work that u didn't deploy on git, with just one line of code ....😔😔😠😤..
I wanted to delete the virtual environment oo...

Spent nearly 2 hours why the module/plugin on the system was not working. Delete the plugin. Get it from git. Nope. Restart all services, restart server. Still the same. No errors, nothing.

Realized that I had cloned the wrong git repository.

Fuck me.

I started working for a startup as Server Administrator/ System Integrator beside university to get some dollars with easy work and nice people.
((I Know two of the C*Os so I got a had feeling with this. Besides the upcoming story I'm still really happy with my position and career chances here. God bless my Department which has the most funny/rude guys, love you.))

tl;dr:
Guy fakes his Skillset and fuckup whole department, can´t do most of his basic tasks. I had my first and hopefully last interaction with this bastard.

Heres how everything started:
I was more and more involved in the leading processes and decisions.

Heard about a story where and why the whole dev-department was kicked out of his position because they were crappy developers. And cant just believe the stories they told me about the former Dev-Lead

Now I met the former "Development Lead"
I was brought in because we in the IT wondered why he would like to share his local machine password with colleges. After some questions he came out with the Reason.
He is doing home-office for some days a week now and wants his colleges to be able to start his "software". (already confused by that)

The "better IT-guy" in me offered help for automatic deployment CI/CD stuff so that they can use it as an inhouse service.

BIG OOF incoming:
"The code is not in git because I wanted to clean it up before"
"My IDE is the only place where my PHP crap work is running"
"The 'PHP-software' is to complex for this"

My Lead and I were completely speechless,
I understand the decision to kick this "dev-Lead" from the lead position down to a code monkey/ script kid.

Now I´m thinking about getting my Hands on the Lead position after my exams because if such bastards with no clue about basic stuff, no clue about leading, no clue about ci/cd, no clue about generic software stuff get the job I would easily be the "good IT-guy" with more responsibility/ skill.

Now I sit here, hate people that fake their skills and set back work of colleges for multiple months and never asked for help or advice.
And the little "Bastard Operator from Hell" in my just wants to delete all his files, emails account during a migration to completely demotivate the person who failed to be responsible for a team nor their projects.

1) git init
2) organize the structure of the project and check what features you need
3) google the name of the features and search a module that solves it
4) follow the module's tutorial step by step
5) compile the code
6) notice it doesn't work
7) StackOverflow, github, Quora, emails with insults to developers, parcel posts with bombs, try suicide
8) ascertain you could have spent all that time in funnier or more productive tasks
9) right click on project -> delete
10) forget the previous experience
11) goto 1

Why does "git rm ..." Without options delete files! That is the dumbest thing ever. If I wanted to delete files, I could always type "rm file"... You forget --cached you're going to be in for a long day.

Great fucking job github and git-lfs

Github,
First don't tell no one about your fucking limits and then when one goes to delete those files that clogged up the storage, fucking don't let them

Also, even for the unsuccessfull commit, let's charge their fucking bandwidth

And for git-lfs
You can't even fucking use the goddamn help command on git-lfs which they suggest you to use. (I installed git-lfs just as they said)

Use
git branch --merged
to get, you guessed it, all the branches you have merged.

Use
git branch -d <branch-name>
To delete a branch if it has been merged (use -D for forced)

And Use,
git branch --merged | egrep - v "(^\*|master|dev)" | xargs git branch - d

To delete all the branches that you have merged (but not anything with master/dev in their names)

Sorry for the formatting, I don't know how coder formatting works on DR..

Today a merge deleted a bunch of code I had pushed in different branch. How the fuck did that happen? No conflict nothing! How can git delete something like this?!

I was doing something in Git, switching and I guess another process was doing a fetch and now all the files no meter what bench I'm in says Unstaged/Untracked.

I tried deleting the main branch and checking it out again from remote but nothing.

I have no idea what I did or how to fix... Seems like I need to delete the whole folder... But then I'd lose any changes in feature branches out local branches which afternoon checked in....

Question about managing git branches.

For releases, we branch develop (the main branch) into a release.version branch in which we bump the version and do any last minute bug fixes for issues found in testing.

After the release we need it back into the main branch as well as master.

But also we keep the branch as well in case we need it such as for a hotfix release.

Is keeping it right though?

General issue on my team I feel is nobody deletes their feature branches after they are done and merged into the main branch. I think there is a feature in most Repos where it can auto delete these branches when a PR is merged.

And well branches themselves (at least the HEAD) are sort of just bookmarks. All commits can be accessed by their hash and basically is a full snapshot of all the commits that upto that point that it was based off of?

So you could just tag the last commit in the release branch with release.version and delete the branch itself? And that I think is the correct, normal way?

Not sure how to explain this to my boss or team as they aren't big on technical details...

on desktop:

to edit my post i have to copy it, delete it, add a new comment, paste it, correct it and post it..

i feel like i'm doing a git rebase on master

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.

Thought i'd try using VSCode.. initialized folder for git... and then proceeded to delete all my nodeschool work that i'd done over the past year... ARAGH!

time to head into javascript code testing, as i'm annoyed af of testing everything by hand whether my feature works and find the cause to some problems i have encountered
.... but first let me "npm init -y" and "npm i jest" (as the tutorial suggests) real quick in my git project ... whoops😯😐😶🤨 ... woah, ok ... 5000 added files, shit, dependencies 🙄... delete all ... git error😐😥
delete folder manually😪😅
resuming paused tutorial: "and if you've got a git repository, just install jest globally, do not do this in your repo!"
.... just happened to me😑😅

Question about GIT regarding intellij idea. I have a local branch develop and I perform a git fetch via GUI. I see develop gets a blue arrow meaning that there are some remote changes that happened. In the past I would just click on that branch and click update, but I noticed that sometimes fetched commits from remote get applied to my branch in a weird way, for example they get merged. Later when I want to make an MR I get duplicate commits because git doesnt recognize that my branch has these changes already.

Right now I just delete that develop branch and check it out again, to make sure I'm working on a proper develop.

Wondering if there is a better way of doing this instead of deleting develop branch and checking it out again each time?

The only time I didn't envy git is when most of the team had to refetch after our lead front-end developer deleted trunk, committed the deletion, and then a backender had to re-base it off his repo. Until then, I thought only my dog could fetch for days.

Wanted to start a little project of writing a website from scratch with a given template. No framework, just a basic thing. Apparently I've already done some work, long ago. And of course, I don't understand several parts anymore that are written. All knowledge and context gone. fuck...
At least I've realized I went for BEM css, instead of my utility css approach nowadays. Now the css has become hard to change, without accidentally breaking things. Also no git, surely because it was "just a small thing". Almost about to delete and redo. Fuck fuck fuck!