Dev deleted a branch I was working on. When I asked him why, he responded "I don't know. I didn't create the branch so I thought I could delete it"

Frack!

I made some changes in existing repo on my own branch. Created PR for it to be reviewed and merged into master.....

That was more than a week back. But senior engineer never merged it.

Today I see that he closed my PR, deleted my branch. He created his own new branch, added my changes and some of his changes and created PR.

What shit is this?

Thank you, GIT. Thank you. Your reflog saved work of months after someone deleted the wrong branch.

Day 1. Push branch. Make pull request😀
Day 5. Got reply to fix some silly stuff🤡
Day 6. Apply changes. Ask for review again.😊
Day 7. Needed to work for another project for two weeks🤝
Day 25. Came back and pull request and branch were deleted from server 🧐🧐
Day 26. I merge my local branch copy into master and push it to server. So long bitches! 💅💅

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

Someone once used to auto-format most of our code in his branch. He merged it 4 days long and deleted multiple changes in the trunk doing that. 3 months later I noticed that a few of my changes were just gone.

so I added a sleek UI upgrade with 3.7 sonnet on windsurf but that was on the dev branch which was pulled from the faulty deployed branch...
couldn't track the changes I made so I created a different branch from the main branch and modified the endpoint issue...

return to GitHub to see how the merge conflict could be resolved in order to maintain the UI mods only for me to realize I deleted the branch while dozing off last night 🥲

summary - I think I'm done ❌

Trying to merge
A conflict was found, just small changes on both files
Trying to resolve
*A hour later*
Deleted the code form both branch, merged the branches and repushed the code to the merged branch.

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

So, today, I wanted to try setting up a wireguard VPN server on my little raspberry pi at home. I... expected /some/ issues, but what I found dumbfounded me.

1 - I already had the wireguard package from the unstable branch of the main raspbian repo installed... Huh, okay.
2 - Setting up config was extremely easy... Wow, so the rumors were true. Wireguard really is almost dumb-simple.
3 - Failed to create a network interface? Oh, trouble, here it is! So lets see... modprobe wireguard... Nope. Don't have the module? What?
4 - Reconfigure package to rebuild the module - missing kernel headers? Huh... weird

This was the simple stuff... Then I went down the rabbit hole of the Raspberry Pi ecosystem:

1 - There is the Raspberry Pi Bootloader, that is apparently separate from the Kernel itself. And I didn't seem to have any of the standard linux-image-* installed... What? Weird, yet there I was, running a 4.19.42-v7+ kernel...
2 - No kernel and no headers... What... The... Fuck
3 - Okay, so... Lets just... try to install the latest kernel image then? One apt-get install... It downloaded the image, but during package configuration, it failed because... I didn't have... its headers? What? What for? And if it needs them (for whatever reason), why isn't the headers package as a dependency? Ugh, whatever...
4 - Another apt-get install and... Okay, building the initrd image aaaaand...
FAIL
WHAT. What is it this time!?

Oh... Ran... No more space on device? What? Is /boot independent? Of course it is, it has to be, its a bloody different filesystem

Okay, so, lets che-OH MY GOD WTF.

Its just bloody 45 MBs big! The entire /boot is just 45 MBs large. WHY. THE. FUCK.

This was a default raspbian install from I have no idea when. But... Why. Oh WHY would ANYONE pre-configure /boot to be this incredibly tiny!?

No wonder the new init ramdisk couldn't fit in there! Its already used up from 64%!

Thanks, Raspbian Devs, now I gotta reinstall the whole system because, yes, the /boot is, of course, sector 8192. Just far enough from 2048 that there are *some* sectors free - About 3 MBs.

So what did I try? Remove the partition and recreate it from the very beginning. Only... I never tried in in the past, and okay, kernel doesn't like having the partition where its image resides deleted on the fly, it will not give up FDs pointing there or something.

So now, I have a system I cannot reboot, or it will never boot back up :|

Thanks, Raspbian!

I need to get a cheap 1U somewhere or something T.T

A: oh hey my commit is not in the master branch...
A: *seeing bunch of commit deleted activity in bitbucket by B
A: Lol B deleted commits in master branch
B: Wait, what?! I know I have rebased my branch.. but never have I rebased anything in the master branch.. how can this be *intense breathing
B: Are you sure you have pushed yours to master?
A: Sure I've rebased, squashed, and rbt landed my work to master, here look my local master has my commit
CTO: wait what? Is this related to this bug we have in production just now? Please don't panic, let us resolve it

Turns out rbt land just squash your commit to your local master branch and they thus A have not pushed it to the remote. And the bunch of commit deleted activity were bitbucket not informing from which branch the activity was happening. Almost gave us heart attack.

Perforce just deleted all my work from yesterday and today. Apparently using the 'update branch mapping' feature is a bad idea

we hired a new front end dev and she made her first commit.... and then some more... a week later I see that she had somehow deleted the .gitignore file and so all the composer files among other things were now in the branch. had to go back and fix that quick lol

Sometimes I just have a crazy idea for an amazing feature I could add to a side project.

Then my brain goes into a fight with itself over this feature, one side saying "that's a lot of work, not worth it" and the other side "but then we could also do this and that and hey maybe we could even simplify other stuff a little bit" and in the process getting really fond of that feature. After some time, the idea is really optimized because the lazy side of my brain hates unnecessary work.

Anyway, I just came home, created a new branch and deleted a quarter of my code base which is now obsolete.

For some reason, out of no where, I made this word up. It's called Moop, and it's definition is paradoxical. It means "everything and nothing, anywhere and nowhere, etc". So one day at work one of my coworkers pushed his untested commit to the master branch of our 25k project. To make matters worse, he deleted all other branches and previous versions of the project. Our project manager heard about it and became so angry that he almost broke our no-curse-word-policy. So he called is all together to get around it so he could properly vent.
Project manager: "Guys I'm extremely angry at James (the one who pushed the untested source code to our commercial project, ruining it)
Me: well, I have a word that we can use
Project manager: what is it?
Me: Moop
You can guess what the next few weeks at work was like. All of my coworkers had to fix the crap James made, including myself. So the conversations went like this: "The mooperfluffer James should have never mooped with us!", "MOOP YOU JAMES, I HOPE YOU HET MOOPED TO HELL YOU MOOPUP!!!!!", "Hey James, guess what! I hope you moop yourself". Our boss became a strong moop user and spray moop all over James workstation. We put moop in his cup, his laptop keyboard, even his thumb drive. We downloaded moop.exe to his PC so we could moop his kernel.

Today James' life is officially mooped.

GitKraken is a piece of shit, there’s no other way to word it.

I’ve been working on a branch on my own for a while committed most things I did except the very last things. Since the branch was quite old I decided to rebase onto develop to be more up to date. So for the modifications I didn’t commit I stashed them, then I started rebase, thinking it was done I poped my stash. Then I saw there were rebase conflict so I pressed cancel rebase thinking it would just revert to the state before the rebase. BUT GOOD LORD NO, YOU GOT IT ALL WRONG…

No it just deleted my stash in the process as well 🤦‍♂️