When you stare into git, git stares back.

It's fucking infinite.

Me 2 years ago:
"uh was it git fetch or git pull?"

Me 1 year ago:
"Look, I printed these 5 git commands on a laptop sticker, this is all I need for my workflow! branch, pull, commit, merge, push! Git is easy!"

Me now:
"Hold my beer, I'll just do git format-patch -k --stdout HEAD..feature -- script.js | git am -3 -k to steal that file from your branch, then git rebase master && git rebase -i HEAD~$(git rev-list --count master..HEAD) to clean up the commit messages, and a git branch --merged | grep -v "\*" | xargs -n 1 git branch -d to clean up the branches, oh lets see how many words you've added with git diff --word-diff=porcelain | grep -e '^+[^+]' | wc -w, hmm maybe I should alias some of this stuff..."

Do you have any git tricks/favorites which you use so often that you've aliased them?

*came in this morning to see this conversation in slack from the remote teams*

Dev: Hey guys, I'm trying to push to the develop branch, telling me its locked. Is there a new process?

Lead dev: Yes I locked it because the repo is now dead, the last release that went out is the last for this year and ever for this app. Were merging this app with another, starting from the last release's code. We'll all have to swap over to the new repo soon.

Dev: ... eh ok I didn't put anything in the last release branch as it wasn't urgent. Normally our process is anything in /develop goes out in the new year. I've been merging to /develop for the last few weeks ... is that code now gone?
*14 question mark emoji reactions*

Lead dev: Yes
*27 angry emoji reactions*

Engineering manager: WHAT? when was this decided? When was it communicated?

Lead dev: oh I assumed my product counterpart had been spreading the messages around, have they not?

Several teams: no, nope, first i'm hearing of it.

Lead dev: Ok, i'll ask them what happened. Be aware then that most of the stuff thats going into develop now, most likely won't be allowed in until March. They want to prioritise releasing this new merged app and don't want anything to impact it.

Dev: So wait, i'm working on stuff now. What do I do? Where do I base the branch? Where do I merge?

<no response>

*My team comes into the office*

Dev: eeehhh ... what does this mean for our past 4 weeks of work? and all the stuff needed to go out in January?

Me: not.a.fucking.clue

New senior dev joined the project today.
Senior dev: "There's no way for me to test my changes before I merge this into develop"
Me: "Can you at least run our test suite?"
An hour later the develop branch is fucked and everyone who has merged it locally has pages of red errors splattered across their screens whenever they run any tests.
Start looking into what the fuck is going on.
Notice that all the errors are related to changes the new guy made.
Ask him if he ran the tests..
Senior dev: "Nah they wouldn't catch anything locally "
Stare at the stream of red text running down my screen.
Normally I wouldn't care but we were trying to prepare a release... RUN THE FUCKING TESTS ASSHOLE.

Fucking fuck fuck fucker fucking fuck

What a dumbass guy seriously. I have this colleague in my office who refuses to create a new branch because that will "ruin the single straight line". Are you seriously fucking kidding me??? The noobest guy ever doesnt know a third git command other than pulling and committing fucking nonsense. Why use git then? Just go back to creating zip files are maintain code. Fuck that guy too who hired him and now because of this fucking asshole I am not able to carry on my work.

Such so-called "developers" should be strapped to the back of a horse and the horse made to run on a gravel road for fuck's sake.. Fuck you man 🖕

"I'd rather post my nude pictures in slack than this unfinished feature branch... I would just feel a bit *too* naked"

— coworker

!rant
!!git

Who here uses `master` for development?

My boss (api guy) tried to convince me that was normal practice. I gently told him that it sounded crazy and very very bad.

Here's the dev path I'm enforcing on my repos:

(feature branches) -> dev -> qa* -> master -> production*

*: the build server auto-pulls from these branches, and pushes any passing builds to staging/production.

Everyone works on their own feature branches, and when they're happy with their work, they merge it into `dev`. `dev`, therefore, is for feature integration testing. After everything is working well on `dev`, it gets merged into `qa` for the testers to fawn over and beat with sticks. Anything that passes QA gets merged into `master`, where it sits until we're ready to release it. When that time comes (it's usually right away, but not always), `master` gets merged into `production`.

This way, `master` is always stable and contains the newest code, so it's perfect for forking/etc. Is this standard practice, or should I be doing something different?

Also, api guy encourages something he calls "running a racetrack" -- each dev has their own branch (their initials) and they push to that throughout the day. everyone else pulls from it regularly and pushes to their own branch. When anyone's happy with their code, they push from their (updated) branch to `qa` (I insisted on `dev` instead.)

Supposedly this drastically reduces the number of merge conflicts when pushing to an upstream branch due to having a more recent ancestor node?

I don't quite follow that, but it seems to me that merging/pushing throughout the day would just make them happen sooner? idk.

What are your thoughts?

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

other dev at work: "why cant i switch branch of my SVN repo like Git"
Me: "Cuz it uses different approach, different branches are at different locations......."
Him: "but how can i use it like Git"
Me: "you cant"
Him: "but why"
Me: "Get away from me before i throw something heavy at you"

I left a company once. Was there with one colleague and we had this kind of code review habit that we looked at each other changes befor merging them to the deploy branch. On my last day I made a dancing cat dance in front of our app as a tiny joke for him. He instead of reviewing just pulled this time and deployed the new version on the companies dev server without a look. So the fist time the cat showed up was appareantly in the first meeting after I left and everyone went completely crazy because they thought they got hacked.

I think they never found the hidden rock roll in the app.

Don't look at my branch...

- Merging 300 files from one branch to another in TFS.
- No merge conflicts.

My first thought:
This can't be right. I must have done something wrong...

I've had many, but this is one of my favorite "OK, I'm getting fired for this" moments.

A new team in charge of source control and development standards came up with a 20 page work-instruction document for the new TFS source control structure.
The source control kingpin came from semi-large military contract company where taking a piss was probably outlined somewhere.

Maybe twice, I merged down from a release branch when I should have merged down from a dev branch, which "messed up" the flow of code that one team was working on.
Each time I was 'coached' and reminded on page 13, paragraph 5, sub-section C ... "When merging down from release, you must verify no other teams are working
on branches...blah blah blah..and if they have pending changes, use a shelfset and document the changes using Document A234-B..."

A fellow dev overheard the kingpin and the department manager in the breakroom saying if I messed up TFS one more time, I was gone.

Wasn't two days later I needed to merge up some new files to Main, and 'something' happened in TFS and a couple of files didn't get merged up. No errors, nothing.
Another team was waiting on me, so I simply added the files directly into Main. Unknown to me, the kingpin had a specific alert in TFS to notify him when someone added
files directly into Main, and I get a visit.

KP: "Did you add a couple of files directly into Main?"
Me:"Yes, I don't what happened, but the files never made it from my branch, to dev, to the review shelfset, and then to Main. I never got an error, but since
they were new files and adding a new feature, they never broke a build. Adding the files directly allowed the Web team to finish their project and deploy the
site this morning."
KP: "That is in direct violation of the standard. Didn't you read the documentation?"
Me: "Uh...well...um..yes, but that is an oddly specific case. I didn't think I hurt any.."
KP: "Ha ha...hurt? That's why we have standards. The document clearly states on page 18, paragraph 9, no files may ever be created in Main."
Me: "Really? I don't remember reading that."
<I navigate to the document, page 18, paragraph 9>
Me: "Um...no, it doesn't say that. The document only talks about merging process from a lower branch to Main."
KP: "Exactly. It is forbidden to create files directly in Main."
Me: "No, doesn't say that anywhere."
KP: "That is the spirit of the document. You violated the spirit of what we're trying to accomplish here."
Me: "You gotta be fracking kidding me."

KP grumbles something, goes back to his desk. Maybe a minute later he leaves the IS office, and the department manager leaves his office.

It was after 5:00PM, they never came back, so I headed home worried if I had a job in the morning.

I decided to come in a little early to snoop around, I knew where HR kept their terminated employee documents, and my badge wouldn't let me in the building.

Oh crap.

It was a shift change, so was able to walk in with the warehouse workers in another part of the building (many knew me, so nothing seemed that odd), and to my desk.

I tried to log into my computer...account locked. Oh crap..this was it. I'm done. I fill my computer backpack with as much personal items as I could, and started down the hallway when I meet one of our FS accountants.

L: "Hey, did your card let you in the building this morning? Mine didn't work. I had to walk around to the warehouse entrance and my computer account is locked. None of us can get into the system."

*whew!* is an understatement. Found out later the user account server crashed, which locked out everybody.

Never found out what kingpin and the dev manager left to talk about, but I at least still had a job.

Our manager is not a developer and he has no idea of what we are doing most of the time, but he thinks that stand-up meetings are the coolest way to control us.
Sometimes coworkers joke about his lack of knowledge and today I think we reached the highest jerk level: «Yesterday I opened a new branch on the git repository and today I'll continue on this task».
I struggled to stay serious on my turn.

My computer science teacher won't stop developing on the production server 😭 he switches the branch on the production machine to dev all the time and merges broken code into master. Kill me

So, at my company we are migrating from "master" branch on github.

It's good to know we are defeating racism.

Today, one of my coworkers had to translate a bunch of pages to French ...
He did his job, committed, pushed, and asked someone to validate his branch in order to merge.
Tests didn't take long, the login screen was broken, because there was an there was an <input type="mot de passe"> ...

Teamate: Hey I'll checkout you're branch to see what you've got done today.
Me: ...Ok.
Few hours later Teammate forgets to change branch and overwrites all my code in my branch causing merge hell and creating hours of more work.
Me:...what in the f***?!

Usually I do love my colleagues, but lately....

FOR FUCKS SAKE I AM NOT YOUR WALKING HUMAN GOOGLE SEARCH ENGINE SHITOVERFLOW CHATGEPETTO INSTANCE! READ YOUR FUCKING LOGS, DO A FUCKING INFORMATION LOOKUP, READ THE FUCKING MANUAL.

OH YOU HAVE A QUESTION YOU SAY? PLEASE FOR FUCK SAKE ELABORATE WITH SOMETHING MORE THEN 'Please help me with the pipeline"' WHILE YOUR ACTUAL PROBLEM IS A LACK OF KNOWLEDGE AND UNDERSTANDING OF GIT, LINUX OPERATING SYSTEMS AND AUTOMATION.

OH YOUR BRANCH IS, WHAT, 3 MONTHS BEHIND MASTER? NEVER HEARD OF A FUCKING REBASE? WHATS THAT YOU SAY??? YOU DONT KNOW WHEN TO SKIP A COMMIT??? ITS YOUR FUCKING CODEBASE! READ THE FUCKING DOCUMENTATION !!!

WHATS THAT? YOU WORK IN VSCODE AND YOU DO T K OW HOW? AGAIN READ THE FUCKING DOCUMENTATION !

Self.end(rant)

Writing more infrastructure than product.

Look, my application requests and transforms data from a single external API endpoint, it's just one GET request...

But I made an intelligent response caching middleware to prevent downtime when the parent API goes down, I made mocks and tests for everything, the documentation is directly generated from the code and automatically hosted for every git branch using hooks, responses are translated into JSONschema notation which automatically generate integration tests on commit, and the transformations are set up as a modular collection of composable higher order lenses!

Boss: Please use less amphetamine.

Adventures in security land.

The “legendary” lead dev authored a ticket that logs raw credentials for a third-party tool we’re using, and logs partially-obscured consumer passwords. His reasoning: “for debugging. And customer service!” And then argued with me over why that’s bad! Seriously?

Then in the release channel, he and the release manager are talking like I’m pestering them with my findings. Things like “I have some Root-induced changes coming” and “Fixed those, but she’ll probably have more...” etc.

Like come on.
I’m even being nice here, but you seriously need to stop screwing this up.

They also didn’t bother merging the fixes into the release branch, so I needed to re-review the entire (large) ticket on its own branch. Doubles the effort since I can’t easily see what changed.

The lead dev also only updated a few of the specs (despite me sending him a list), so there’s a bunch of failing ones now. Makes me unsure if he actually fixed everything.

Maybe I’m just being touchy, but ugh. Freaking annoying people.

At least he owned up to being the author this time instead of saying someone else (who wasn’t in the history...) wrote it. -.-

Every time I mess up my git branch I usually find that its pretty futile to fix it with fancy commands like 'git reset', 'git prune', 'git rebase', etc. I usually find it easier to just start over from scratch.

They should really add a command for that

'git fuck-it-start-over'

My team mate has just found the best conditional statement I've ever seen, in a source code he received from the client.
if (1 == 1)... and it has an else branch :D

Fvcking project manager wants me to commit my partials code to the master branch just to let our employers know that we did something today! That's why you are there to relay our predicaments to them, you piece of shit!
Now he is insisting it the whole team. Fvck! Are you nuts? Do you really understand what version control really means? Why master branch, why can't we just create fucking different branch and push it there if they want reference! Commits are supposed to be a fix code or update not a broken and unfinished piece of codes! I will fvcking cross my finger after messing up the master branch. Now it looks so disgusting to me.

My first contribution to a GitHub project was finally merged to the master branch today! It was just a bug fix but it’s a start!!

The top two:
* the laziest intern ever!! He lived 100m from the office but was always late for the daily. Even managed to forget his fucking laptop at home!! His mommy had to wake him up!!! He was so useless that I thought he was on the first year of his bachelor's degree and later the team said to me that he had finished it.

* some frat bro, got an internship thanks to daddy inside my ops team. He managed to insult everyone in his first week!!
So I had to tell his daddy, that his son will work under the office support team and will be in charge of the first level support for his branch. Daddy fired his son sorry as after two weeks!!

Holy shit balls it works (so far)

-
So I’ve been working on a project... well feature for the past year (yes 12 whole fucking months - anti agile I know)
And today I got to merge that bitch of a pull request into the current working branch and deploy it to UAT - no conflicts 😵I think I need to put the lottery on tonight!
And some how, by some stupid lucky roll of the dice it just works.

I have never felt so afraid and delighted in my life!

*team convo*

Dev: We will create another branch for the changes and merge them when required.

Director: Can we not do the changes in the current branch and comment them out until required? I think that’s cleaner and not confusing in my opinion.

Beautiful mf!

My team lead force pushed to master. This guys always complains when we merge PRs with wip or fixup commits and he just did it himself and tried to cover it up doing a rebase on the master branch.

Good job fucking up everyone. 👍

A : "what the funk is wrong with git ! why there are conflict!!"
Y: "let me see, hmm .. just press ctrl + disc.."
A : "what are you doing ?"
Y : "discard! they are gone. now you can try again in different branch"
A : "I didn't commit !! this my work of two weeks!!!"
Y : " ..... "
Y : *sneak away*

Push people to review my PRs to merge before a teammate so I don't have to rebase my branch

First I wanna say how grateful I am that devRant exists, because my friends either don’t understand this vocab or don’t care lol.

Last week I worked on a pretty large ticket, opened a PR with 54 file changes. Just to follow standards I set the PR milestone to a future release version, but the truth is I didn’t care which version this work ended up in— I just needed it to go into the develop branch asap.

Since it was a large PR there was some expected discussion that prolonged its merging, but in the meantime I started a second branch that depended on some of the work from this branch. I set the new branch’s upstream to develop, fully expecting my PR to merge into develop, since that’s what I set the PR base to.

I completed all the work I could in the new branch, and got two colleagues to approve the initial PR so it would be merged into develop, I could add the finishing touch and get this work done seamlessly before the week was over. They approved, it got merged, I pulled develop, and… my work wasn’t there. I went to look at my PR and someone had changed the base branch to a release branch. It was my boss, who thought he was helping. (Our bosses don’t actually work on the same team as us, so he didn’t know. it’s weird. We have leads that keep track of our work instead.)

I messaged him and told him I really needed this in develop, knowing our release branch won’t be in develop for probably another week. I was very annoyed but didn’t wanna make him feel too bad so I said I’d just merge the release branch into my new branch. So many conflicts I couldn’t see straight. His response was “yeah and you’ll probably have a bunch of package manager conflicts too because that’s in that release.” He was right— I have so many package manager conflicts that I can’t even see how many compiler conflicts there are. I considered cherry picking my changes, but the whole reason I set develop as my upstream was to avoid having any conflicts since I’m working in the same functions, and this would create more.

So I could spend the next (?) days making educated guesses on possibly a thousand conflict resolutions, or I can revert my release branch merge and quietly step back and wait for the release branch to be merged into develop.

I’m sure cherry picking is the best option here but I’m genuinely too annoyed lol, and fortunately my team does not care to notice if I step back and work on something else to kill time until it’s fixed automatically. But I’m still in dire need of a rant because my entire plan was ruined by a well-meaning person who messed with my PR without asking, so here is that rant and I thank you for your time.

Today `master` turned into `main` for me on Github and I was like "wait did someone make a branch on my repo."

Should of been called the "magic" branch because shit breaks for no reason like magic.

So I met this Professor in my campus recently.. This life-changing conversation followed :
Prof: What are you doing on your laptop?
Me: Sir, I am practicing some coding problems.
Prof : Coding problems? What's your branch?
Me: Electrical Engineering.
Prof: You aren't expected to code. And you aren't taught much coding in your coursework too.
Me : Sir, I take it as a passion and I did learn coding all by myself.
Prof : Rubbish. Learning coding by yourself is similar to saying that you don't require a Prof. to teach you. Just focus on your subjects and stop wasting your time.
Me :Good afternoon, sir. You're right, I did waste my time here.
*Grabs laptop and leaves,hoping he won't be taking any lectures in my next sem. *

He asked me for help on something, i didnt find the problem so i asked him to create a new branch and let me figure it out.
I went back to my PC, cloned the project, but it took me like forever ..
node_module was removed from .gitignore, i asked him why ? He said "i changed on the source of a package i used, what can go wrong? " ...
I almost hit him with a chair c:

My feature branch is not yours! Stop pushing unrelated things! GO AWAY.

Greetings from Denmark! Thought I would join after a lot of lurking, and tell a little story, as to how I fucked up when I started in my company.

I've been there around 10 days and had never used git besides just add, commit, and push. I was told to work in feature branches, and I did, I was playing around trying to learn, and got some merge conflicts, made a lot of unnecessary commits etc. I was told to clean it up before I merged into dev. And as I didn't know git I asked how I could do that. I was told I could force push in my branch, and that it was okay as long as it was only inside my branch. I tried that and saw my command line force pushing to all branches including dev, and master. My heart skipped a couple of beats, and I went directly to my Lead developer and asked what happend. He got a bit mad at me for pushing in dev and master, and override all the commits there had been made. I tried to explain I didn't he did not really believe me, I was so nervous. Luckily everything came back to normal with people's local branches being pushed etc. But that day I learned about git's push matching config, and my lead was luckily only mad in the heat of the moment and even apologized for getting mad. Just one of my little fuck up's in my short time as a developer

today I pull a project to take over from my colleague
today I notice all commits where on master branch
today I leave this world T_T

Assigned to a new project team..

Using git, in a creative way. So.. "master" is "dev" branch, usually. Everyone can push their branch to dev server .. so it's "dynamic for us". Production branch is whatever, as long as the branch has the release version. Sometimes, the release comes from "master".. that mean "dev" in normal geek..

That's just Git. The source code is a saturated spagetti of Entity framework and Caliburn. It is littered with antipatterns, especially basebean. Holy Christmas and Easter that baseclass do a lot of stuff that has no place as a base class ..

Fucking frameworks, I'm gonna start to evangelize frameworks as the no1 antipattern.

MS SQL as the main DB, but is dumped to json FILES through a scheduled task to increase read performance on web.

There is a soap endpoint to expose the json files, fml..

I am assuming I was placed here to improve stuff, I have never in my life seen anything like this before.

There is a special place in hell for this repository

Android oreo made me change so much code and broke so much shit like background services that my latest branch in git is FuckAndroidOBranch

I spent four hours just getting my dev environment working again today.

Whenever I switch branches on this project, I keep to run a script that does migrations, seed data, test db setup, static test info, etc. etc. etc. It takes 12-15 minutes to run.

Today, that script failed.

Apparently one of its steps requires running some of the project's code to produce valid objects. Makes sense. However, my ticket involves breaking a crapton of models (removing accessors) which I've already done, and then patching the behavior, which I haven't. Which means a lot of things are currently broken. Makes sense why the script fails.

However, I can't run the script on a different branch and then switch back because that simply doesn't work (for reasons), so I needed to find some workaround. I eventually did, but every attempt cost me 12 minutes.

Today was not fun, and certainly not productive.

I wonder when they're going to fire me 😅

My progression of learning git rebase:

Year 1: WTF just happened?! Where is my code?! *deletes and re-clones repo*

Year 2: Ok if I do it suuuper carefully I can get the other dev's one-line change into my branch...shit...shit...wait...fuck...oh lol it worked.

Year 3: Oh yeah let me organize my commits real quick. *drop pick pick squash reword pick fixup drop pick* *git push -f* 😎

I didn't even come back home yet and these workoholics already conflicted with my feature branch

The fucking hubris on some people... If you don't understand git, in a shop that uses git, how in the name of fucking odin's nutsack do you think you're qualified to be a senior dev? I'm not talking understanding the internals of git, I'm talking knowing WTF a branch even is! Oh, I know, its because you eat lunch with the bossman! Cronyisn is alive and well folks! Now I gotta fix all this shit, or its my fault...

I recently started working with CI/CD in gitlab. I don't know why I had such a hard time getting it to work. I left it hanging for another day. Yesterday, before I went to sleep, I merged to master branch. On waking up I can't explain my happiness when I saw my pipeline... 😀

Finished my project early today. I assumed it would take another day or two since it's primarily research and I had no idea how to progress, but I caught a break and finished it early. I also finished another surprise ticket! yay! I had the rest of the day to myself!

... had!

But then I noticed I had been working on the wrong branch. Fuck. Moving my work over was tedious, as was the cleanup. I kicked myself for good measure. Also, every time I switch branches, I need to run a bloody slow script that runs all the migrations, data tasks, backfills, etc. for the branch. It takes 12-18 minutes. There's a faster version, but it usually breaks things.

Turns out the branch I was supposed to be working on wasn't up to date with master. So I merged that in, leading to....

merge conflicts. Because of course there are conflicts. To make matters worse, I had (and have) no idea which changes were correct because idfk what those 248 new commits are doing. So I guessed at them, ran the script, and (after more waiting) ran a few related specs. Yet more waiting. Sense a pattern here? Eventually they finished, and all the specs passed. H'ray. So I committed the changes, and told Jenkins to kick off a full spec suite, which takes 45+ minutes.

La de da, I go back to cleaning up the previous ticket, pushing reversion commits, etc. Later, I notice the ticket number, look at the branch number I've been working on.... and. Fuuuck. I realize I had put everything on the wrong freaking branch AGAIN. I'm such an idiot. Cue more cleanup, more reversions, running the bloody script again and again. More wasted time, more kicking. ugh.

All of this took well over three hours. So instead of finishing at a leisurely 5:00 like a normal person, I finally stopped around 9pm. and I won't know the Jenkins spec results until morning.

A nice early day?
I should know better.

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

I have to confess. I'm a distro hopper. I've been a distro hopper ever since last year, and it got me tired. I spend entire hours checking distrowatch, partitioning, setting up hardware and drivers and passwords... I've tried to stop, I swear, but every time I do, there goes a new Solus release, an Openbox Debian based new branch, a forensic floppy disk that I know that I won't ever use for real. I just love assigning swap, fighting with rEFInd icons, testing modules, navigate trough different configs... Oh God, I even set up a virtual OpenBSD, just to see what it can do.
My friends have been telling me to stop, because I don't take care of our relation, that I'm becoming a monster. It's shameful and embarrassing to me when they ask me about my day and I say "you know, installing Manjaro on my desktop, and Lubuntu to that crappy old Asus I have for backups" I think I'm going to lose my head some day, this sickness is driving me straight down to the Slackware pits. I should stop it before I try Ratpoison environment but truth be told; I mean not to stop. I'm a distro hopper.
I ride my way live, unstable and restless.

A month ago. The code for a feature was removed because my boss thought it would not be required. When that was done, a lot of regression testing was done and a lot of code was changed all over the code base. And those changes were merged to main branch along with a bunch of other changes.

But now, he wants me to put that feature back just as the release date is approaching. It's just a humongous waste of time. Now I need to find where all the tentacles of that bloody feature reach and manually put back the code. And the bloody testing needs to be done all over again.

When will I get to stop dealing with these kind of people.

Out of necessity (or rather: lack of support) I've been neglecting my test suite for the past ~month. Now that one of the beta versions of RSpec has better Rails 6 support, I can finally get back to writing tests. Yay!

I just merged staging into my testing branch, and it's now 344 commits ahead of origin! eep.

So, I've got lots of tests to write. yay.

Introduced git in work about 5 months ago, explained to my coworkers how it works, shared links to tutorials, git pro book and everything imaginable.

Almost every day I learn something new ... they keep struggling to checkout a branch or resolve some simple conflict...

I'm just tired of explaining things...

Now I just go and fix every thing and learn a lot :)

I become Windows insider as soon it was announced. I have been using Skip head branch for my main pc for the last 5 years.

It meant installing at least three windows version every month for the last 5 years. It was a good journey(Still going on).

The one thing surprised me that in those last 5 years that windows never started installing the update when I was working. Not a single time my work or progress was lost due to windows update.

In PHP (yes, it's a language I... don't hate) I've always hated exceptions. They're like GOTO, in an OOP world with interfaces and contracts, try/catch is really odd as it breaks a promise about returning with a typed value.

But you can now do this in PHP8, which comes pretty close to Maybe/Either monads (Option, Result whatever it's called in other languages):

function getUser(): User | UserNotFound

PHP8 unions don't come with the same strong guarantees as in other languages but *pets PHP gently on the head* you did well, my boy.

Now I would really love it if PHP9 could do:

function getUsers(): Collection<User>

Type Tree<T> = Null | Node<T>;
function 🎄(): Tree<Branch<Ornament|Light|null>>

So ive been messing around with my Google Home.. because having a voice activated weather station is cool and all, but as a developer it needs to be useful no?... and Raspberry Pi, cause you know, we cool kids have those sitting around doing nothing useful.

But back on track, getting these two to actually work together, and that almighty moment you can say "Hey Google, Deploy Project -X- to the Pi" and the Rpi just kicks into gear and pulls down the latest master branch from Gitlab for the correct project is mind boggling.

No more ssh + sudo git pull !!!

Disclaimer: i didn't pay for that Google Home, but its in my house, listening to my TV, so i may as well use the damn thing.

Today my first ever PR on a community repo on Github just got merged!

I was always afraid to open a PR on any project because of my lack of self confidence. It's a really big milestone for me and I'm really proud to say that the code and the tests I wrote immediately got approved and merged into the main branch.

We're no strangers to code
You know the conventions and so do I
A full commit is what I'm thinking of
You wouldn't get this from any other dev

I just want to tell you about my problem
Gotta make you solve it for me

Never gonna git you up, never pull you down
Never gonna rant around and rebase you
Never gonna merge your branch, never gonna say $#@*!!
Never gonna risk a cry and build you

A colleague's story...
"I named this branch after my girlfriend at the time, so that I could check her out at my will. I texted her about this, she was not amused..."

My company’s code base is so messy that the dev branch and master branch is so buggy. But they put the blame on me as usual.

I use git blame, I wasn’t the author .

Boss is also a programmer which is nice. boss is also incredibly impatient. so when he gives me a project to do, when I don't have it done the day of, he goes and does it over the weekend. but he doesn't tell until a few days later when I finish the following Tuesday. he chucked my git branch and just pushed his stuff to master. then he belittled me because there was a feature missing in his code and I hadn't done it yet. I don't know how to deal with this. on the one hand, I could try and work faster. but on the other, I am trying to add features to software he wrote in c-style c++, didn't comment, and hasn't been updated to modern standards since 1998. even the copyright files are 1997 to 2001. just very discouraged as its my first job in the field. it wouldn't have been so frustrating if he had just told me he'd worked on it himself instead of letting me finish it and then throwing it in the trash.

end rant

This community is amazing. I started developing an app from scratch, with no knowledge of how to do it but this community has helped me so much. I have just started it, been a few days but devRant is what got me into coding in the first place. I was more of a hands-on electronics/mechanical engineering kinda guy but this has been amazing and I might just switch to computer science branch for my engineering. Thanks devRant and the community :)

The guy who became my manager just pushes to the prod branch.

On a repo where another team clearly set up development and production branches.

This guy has been pushing code like crazy and I always wanted to take my time setting things up properly in our team: TDD, CI/CD, etc.

Because he pushed so much he became my manager and I was seen as unproductive.

Data Science and software development best practices just dont coexist it seems.

Yeah yeah, it's up to me to start introducing good practices, but atm "getting it done" takes priority over the real based shit.

git push origin stupid-long-feature-name
git pull origin develop
*Checks through all changes. No major conflicts. Accepts changes.*
npm test
*4 failing tests, none of them in pieces that I touched for my feature.*
*That's funny. QA was loaded from the develop branch, and everything works.*
*Actual data has dates from today. Expected data has dates from a week ago.*
*examines tests*
Why are all these expected dates hard-coded‽

tl;dr The external development team committed 4 tests that would only ever pass on the day they were written.

WOW!! What a fucking cop out. After what happened yesterday about branching. my senior and our boss had a meeting and I wasn’t included. My senior then message me to next time dont create another branch just use the existing branch even if it was merged. I said “ok but i thought thats the best practice, we we’re doing that since the beginning”. Senior then responded “Whats best practice for our boss, that will be our best practice” what a fucking cop out!!! Bitch!!

I try and try and try to teach my coworker critical thinking skills, proper programming techniques, and standard git etiquette. Then I add 4 booleans to solve one problem, use strings instead of ints to find unique SQL Server entities, and push right to the development branch.

I am a real asshole, but at least I am not fake.

From a buddy:
A friend's comment on the latest merge conflict on the integration branch:
"O brachName! my branchName! our fearful sprint is done,
The build has failed with every merge, the goal we sought not won,
The release is near, the worst I fear, would Product be exulting?"

Oh look. The monitoring channel is in flames, smartphone is vibrating so hard it's having a seizure.

Hm. Nah it's fine. Not my...

Damn it. Incoming call. -.-

I'm actually on vacation (more like you need to trim down overtime before management get's angry).

They decided to test the new hardware / os stack I set up in the last weeks. I'd actually be happy about it If I wasn't on vacation and would be part in something that I invested a lot of time...

Well now I am. Guess what. It's running too good.

And that's not a joke. It's partly due to an upgrade in infrastructure (got rid of some last remaining 1 Gbps networks)… but also because I changed quite a lot on the OS / VM side plus we changed from XEN to Proxmox... With major tweaks, too.

The whole stack can now handle peak traffic where it would choke before, and even go beyond the old peak traffic.

Enough of introduction, the simple reason why shit burned down was because they tried out the current development branch and let it ran.

The development branch had an currently unfinished ratelimiter framework, since I didn't had time for an full burn in and didn't knew what the maxima / limits were. And since I hadn't finished that, I didn't finish the traffic shaping either.

Hm. Guess it's not good when you let a bunch of heavy parallelized data generators / analyzers run for free....

In the end, we simply shotgunned the docker development machines, because thanks to network congestion / retransmissions and feedback, they were not really cooperative via network / REST.

But hey: To infinity and beyond. XD

I just merged master branch INTO my development branch. Fuuuuuuuck

I should name my next master branch daddy

Giant, month-and-a-half-long-ticket.
After learning six or so complicated areas of the system and updating them all to work with the new changes, make them all play nicely, etc. I finally got everything working. 95% spec coverage, though no ui tests because I haven't gotten selenium working. whatever, everything's done and works.

Second dev bases her ticket off of mine and continues working. Work elsewhere continues and there's an official release, so we both merge in master. I run tests, everything passes, and go back to working on other tickets.

She finishes her ticket.
We do end-to-end testing, and everything works perfectly. Time for a demo!

She merges in master again, and pushes her branch to two staging servers. (idk why two.)

Demo starts.
We connect to the staging servers, and... none of the UI changes exist; they aren't running the correct code!

So she runs it locally for a demo instead. Two features in my ticket no longer work. She throws me under the bus. She throws me under the bus again by criticising a rake task I scrapped because she wanted to do it. Then again because I didn't update my branch to master and push it before the demo, despite having no reason to. and despite the demo being of her branch.

Then she continues to show off and brag about how she's like the "legend" (senior dev) she envies. QAbuys it.

I'm having an emotion, and it's called anger.

This stupid fucker of my senior writes code directly in server. Whenever I give my branch name to merge and deploy, he types code manually again in the server. This introduced a bug and I had to fix it in server again.

I'm the git expert at my work. This means every time someone has the slightest issue with git (or the git features in their ide), I get interrupted.

😡😡😡

Also I will say it is fascinating watching people who've used centralised version control all their lives struggle with distributed.

"Do you have my changes? I merged them into your branch..."

"You can commit and not push?!"

Why the hell do you keep commit+push your shit to the master branch! We have develop, feature and hotfix, you *************!

Just because you want to test something in prd environment, you don't mess with the master to build the production image. And you do not even rebase fucking develop branch and keep it out of sync you POS!

Excuse my language, thank you.

Today the Git for Windows updater asked if I wanted to let Git decide on the naming of my default branch... Hell no snowflakes!

tl;dr - My company makes me pass around code over email. Is this normal?

How we fix bugs at my company.
1. Simulate bug in dev env (ok, cool)
2. Get the required code from svn and make changes locally (so far, so good)
3. Deploy changes in dev env and test (yeah!)
4. Take screenshots of fix in action along with the files you've changed and mail it to the respective leads (really? send code via mail?)
5. Keep changing your fix based on feedback and keep repeating above steps (what!)
6. Once approval mail comes, check-in your code in the svn branch for deployment and testing in the test env (QA team)

My question to you fine folks is, is this normal? Is this how most companies work? Passing around code over e-mail? Where the different versions of your fix are just attachments in emails. Or have I committed a sin by being a part of this heinous act?

I have a situation that is so out there I almost wouldn’t believe it if it wasn’t happening to me. The company I work at has three branches and around 100 employees. The owner of the company has a brother who needs a liver transplant. Two weeks ago, a company-wide memo went out that all employees would be required to undergo testing to see if they were a suitable liver donor for the owners brother. No exceptions.

Last week at the branch the owner works out of most of the time, his assistant went around to schedule days off for everyone so they could go get tested. People who declined were let go. One of these people was born with liver disease and therefore ineligible to donate. She had a doctor’s note. Other people also had medical reasons as well and some were just uncomfortable with the request and didn’t want to do it. One was pregnant. They were still terminated. My employer’s assistant has said that because our employment is at will, he can legally fire us.

I’m in remission from cancer. I’m ineligible to donate and any kind of surgery would put a major strain on my system. Even if I was healthy, I would still object to possibly being forced into donating an organ just to keep my job. Soon they will be scheduling people’s days off for testing at my branch.

I know this situation is nuts, but I don’t know what to do. I know I could just go for the testing and then be declined, but I don’t think I should have to do that. I’ve had enough with hospitals. Other coworkers who don’t have medical conditions are afraid they won’t be declined because they will be a match. I’m looking for another job but in the meantime I don’t know what to do and I and many of my coworkers are really stressed out.

- Two months ago I joined this company and did literally nothing ever since. For that I would like to thank my line manager and his entire branch for being an amazingly incompetent colleagues, and for mumbling "that's how the client works" every time I raised the same damn problem. Also, let's not forget my HR manager and interviewer, who apparently have no connection whatsoever with real situation of company's projects. And last but not least this remarkably hierarchical workplace where you can't throw a rock without hitting a cocksure higher-up.
Y'all fucks deserve some serious brain readjustment.

need to schedule a call with a guy from another branch at work. i tell him that because of the time zone shift, i can do earliest around noon his time (and that's being generous, thats really early for a dev my time)

and of course, what does he turn around and do? sends me a meeting for 3 AM...

🤡🤡🤡🤡🤡🤡🤡

i can't be the one with mental illness right?

perhaps the thing to do is just go around being so fucking ignorant you're just blissfully happy at all times

So to start off, I am a hipster. Guilty as charged. A few months ago.

Me and my work's programming team decided to enter a hackathon. Note, I had never stayed awake for 48 hours straight programming before.

It was late and I was waiting on programmer 1 to finish writing a class so I can finish a part of the network code. We were all working on the same git repository, same branch for some reason at the time.

So I started just writing in random comments in the code while waiting. I finally got to complete the network and committed my work.

They both made a pull about the same time and both my boss and coworker turned around at the same time.

I had written a comment
// Ya know those glasses I wear to work everyday? They're not prescription. They're fake.

The look of disappointment just staring me down was absolutely priceless. And the fact that they both read the comment at the same time.. 😂😂😂😂😂😂😂

By default, GitHub uses the term "master" for the primary version of a source code repository. Developers make copies of the "master" on their computers into which they add their own code, and then merge the changes back into the "master" repo.

"On Oct. 1, 2020, any new repositories you create will use main as the default branch, instead of master," the company said.

Oh my god. Can you people just fuck off with your arbitrary terminology changes?!?!?

Source tree opened

Finds new option 'cherry pick'

Wtf is this

Clicks on it

Wooow, there goes my master branch again

over 100 commits on my feature branch

yuck

So I am conducting an introductory seminar on git and GitHub for juniors and as per my knowledge I've drafted this outline, please add your inputs..

The seminar will be of 1 day only

1. Install and configure Git and Github

2. Digital Signature mapping

3. Git init

4. New Project with HTML

5. Configure remote (git remote add <origin> <url>) ends with .git

6. Git commit (git commit –m “Title” –m “commit message”)

7. Pushing git push (git remote push origin master)

8. Git commit –amend

9. Git pull (git pull origin master)

10. Git checkout (git checkout –b new_branch_name)

11. Do some changes

12. Git push new branch (git remote push origin new_branch_name)

13. Git switch branch (git checkout <name_of_existing_branch>)

14. Pull requests

15. Git log (git log –oneline –graph)

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?

Annoys me so much how obviously lazy my department has been with one of its products. We have an iPad app that does document management and eForms and stuff. Its not perfect but not the worst. Then they decide they need to build an app to handle a specific kind of eForm. They just went "well this app already does eForms so lets just adapt it".
Worst. Decision. Ever.
the app is simply a branch off the original app. despite being a completely different product which isnt even concerned with the same business objects. it has been hacked until it does what it needs to. And i have to somehow maintain this trainwreck.
As a result we have a branch in our main Git repo that contains a completely different product, which is basically an iOS wrapper for an HTML eForm with ~5000 lines of jQuery to further hack on the functionality that the eForm provides.
And they wonder why iOS developers have been leaving and some keep threatening to leave. Even the Delivery Manager wants us to just do what is needed and get it out the door and never look at it again. How are we supposed to care when thats the attitude of the people who are supposed to be invested in it. Im surprised the client hasnt told us to get lost the app is so hideously broken and unmaintainable. Performing an action on the form can break a completely unrelated section somewhere else. We have lost control.
And they just keep adding more scope, ignoring our concerns cos hey its too late to just start changing the whole approach of the solution.

!rant
It's nice when a great new idea you have is fairly easy to implement and works well.
My latest idea involves running my discord bot, written in nodejs off of my phone using a terminal app (that doesn't require rooting my phone).
Once I got a branch of the project with no voice support, I wrote a bash script in vim on my phone (an odd experience, I assure you) and ran it.
Things have been working well, far better than trying to use PhoneGap to build something that would run it.
All in all, I'm pretty satisfied, and it was a fun and relatively painless project! (thankfully)

My coworker became super restless and incompetent during the initial 2020 Covid lockdown. Like playing hours of video games during work hours restless.

For one project, my coworker was working on the backend and I was working frontend. Coworker also wanted to be overlord of the epic branch.

My coworker merges the epic to our test branch and our code is broken. Coworker didn’t pull my FE changes before merging. Dude, I shouldn’t have needed to tell you to pull. You changed the api response that your BE code delivers so of course I had to update my FE code so it could work with this change.

I had to resolve the conflicts because coworker left work early to “rescue/pickup” their girlfriend from work.

You bet I leave this person on read when they try to text me on Signal

My new co-worker is extremely stressing. I have to give small tasks so he won't forget to do anything. I also have to explain what he has to do in detail, give him the full solution, and show him exactly how he has to do it.

And he has no idea how to use git. He makes a feature branch and pushes all his various, half-finished features into it and makes a pull request.

And then I still have to refactor his crappy code everytime cause he uses variables like $data, $accA, $accB, $accZ and forgets to use the definied color variables in sass.

I literally have to do my work and his as well -_-

Look, i'm trying to do this 365 days of code and guess what? I forgot to push my local changes to the remote branch. I'm on my 43rd day streak and fuck it I have to start again.

When the poet in me fuses with the geek in me:

Will you be the css to my html?

When I encountered you,
My system threw a fatal error
My RAM was overloaded,
And my CPU went haywire

Will you be the css to my html?

I would show you my source code,
And let you merge your branch into mine
I will help you fix your memory leaks
And I will try filling all your nullpointers

Will you be the css to my html?

Your frontend would perfectly plug into my backend
I can compile all your heavy code,
Just in time

Baby just promise me,
You'll provide the JSON
To my API calls

Will you be the css to my html?

This is my first draft... Constructive criticism is welcome!

No technical issue. Just read my company email (which you never should do when on holidays, even if it's the last weekend) and learned that one of the lowest, genetically challenged braindead creatures I've ever had the bad luck to meet will become general manager of our local branch.

Both Conservancy and the Git project are aware that the initial branch name, ‘master’, is offensive to some people and we empathize with those hurt by the use of that term.

Offensive my butt. It's not like any developer alive today had experienced the life of a slave. It's all in the past. Should I get offended by imperial Japanese flag?

Rage!!!

Coworker checks in not working major changes and goes home for the weekend yesteday. When I ask him politely in an email to just check in a feature branch he says he has no time for that and it doesn't matter since the program is shit anyway.

Meanwhile I'm working overtime to get the program ready for a demo next week and another developer has already starting using his changes so I can't just roll it back. Spent my whole morning fixing it, and now can finally start my work in the afternoon.

Arghhhhhhhhhh!

Worst part is... He's the solution architect so anything I bust my ass to get done he'll take credit for and anything that goes wrong he'll blame on me. Can't wait for this contract to end!

This is a post about some gratitude. Many of my friends were not so lucky during COVID and their companies suffered. I am very grateful to be working for a company where my git branch name of a recent commit was 'feature/support-our-two-new-factories'. My company is thriving and growing :)

i asked my senior "why we need a develop branch" and his reply was "-_-" , literally an emoji.

Ok ,well this might be a stupid question, but i have been in this organisation for 6 months and all this time these guys have not been able to make a proper release. either they miss commits while cherry picking, or they end up reverting stuff, or they are delaying the releases due to QA disapprovals, backend issues or management issues.

i proposed a simpler vcs :

1. `uat` is the source of truth
2. for every release we create a temporary branch `release-x.y.z` from `uat`
3. then we develop every feature in a branch cut from `uat` as `feat-abc`, code in it , and merge it back to `release-x.y.z`
4. finally we merge `release-x.y.z` into `uat`

where is develop branch supposed to be cut?
which branch is supposed to be cut from develop?
which branch is supposed to merge into develop?
where is develop supposed to be merged?

no one has answers to these fucking questions. but still they wanna confuse the whole team of 15+ android and ios devs about how to use which procedure

fml :/

Me:
* Builds Project and Hosts it *
* thinking * : * ' I don't really need to push to Master, I'll just push it to the deployed branch *

Me: * tests project from host *

Me: * sees a bug, fixes it and rebuilds the project, hosts it and pushes code to deployed branch *

4Hrs Later:

Colleague: Dude did you see the Typos you made? Fix them!

Me: In my defence, I wrote this at 4am in the morning, did not sleep for 2 days.

Colleague: Don't Care, fix it.

Me: *Creates Hotfix Branch from Master*
* INSTALLS DEPENDANCIES AND FINDS OUT A NEW VERSION IS OUT AND UPDATES THAT AS WELL *
* Runs Project and finds out it's not the hosted version. *
* Merges Deployed Brunch to Hotfix Brunch and this happens *

Error Message: Unexpected token

620 Merge Conflicts

🤦🏽‍♂️🤦🏽‍♂️🤦🏽‍♂️

My new favourite commit message:

"All changes as of 18th Sept"

How tremendously useful? There I was looking to know what changes were made to enable a feature / service, thought I could look for that in the commit message, but no you've given me a much more efficient way of finding out.

I simply need to download the contents of your memory, find out what date you made a change, and then dig through the massive commit to find the piece of info I need.

Forget experience using Git features, managing merges, following Git flow, or even any other SCM ... how can people be so tick when it comes to recording what they've done.

Heres a little cheat sheet for those struggling:

- Commit message
Describe what you actually ****ing did. Don't tell me the date or the time, thankfully Git records those. Don't tell me the day of the week, if I need to know I can figure that out, just tell me what ... you ... did.

- Feature branch names
Now this is a tricky one. You might be surprised to know that this isn't in fact suppose to be whatever random adjective or noun popped into your head ... I know, I too was shocked. The purpose of this is to let other people know what new feature is being worked on in this branch.

- Reusing feature branches
Now I know you started it to add some unit tests, and naming it "testing" is sort of ok. But its actually not ok to name it testing when you add 3 unit tests ... then rip out and replace 60% of the business logic. Perhaps it would have been wiser to create a new feature branch, given you are now working on a new feature.

There is this project where the develop branch is "discontinued" because this moron "finished" a feature that is all fucking broken and I could not figure out how to solve all those merge conflicts...

I just gave up and told my stupid boss who just nods and laughs at everything... If it ever comes up I'm gonna tell them to get the fucker to solve it.

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.

OH
MY
GAAWWWWWD

The funniest thing happened today. I was helping a teammate rebase his branch onto master. Since his root was a merged local branch with 3 commits already in master, but squashed, we had to do an interactive rebase. So we have 3 commits to drop, and one to pick. He was using vsCode on windows, so he got vi to edit the rebase. I told him to change the first three pick for the letter d (alias for drop). Since he was not too familiar with vi, he only changed the first letter. I was like : dick is not a valid command, it's just d. Then he removed it and did the same thing again! When he finally understood, we both died of laughter,and so my ghost is now writting this rant. In the bus. Laughing like a crazy person. 😎

My single life is the branch that never let's me pull.

So I just found an old branch, from an ex co-worker, with a whole bunch of unmerged docs. This effectively cuts my workload for today in half.

Today I'm going home early fuck yeesss

Also I will be sending that guy some well deserved couple of beers

For different reasons, this outbreak of coronavirus lead me to learn how to use git efficiently (never had to before, as I work mostly alone). In two days I learned to fork, branch, pull, push, ... I feel like I really accomplished something for myself.

Oh and I also started to collaborate to a shiny app in R. Any way is good to keep my mind off the fact of being in lockdown in a foreign country.

Stay positive people! :)

Working with a new team and I don't understand how this is normal or ok.

Me: Does anyone need help troubleshooting the broken build or can I revert this change that broke it so I can push my change out?

Dev: Stop build shaming me, I wouldn't leave the build in a failing state.

Me: Well, I wasn't sure how long to wait, before asking.... it's been broken for 4 hours.

Dev: It's the development environment, you should expect development to be going on.

Me: Yes and appears that this project architecture doesn't support any sort of isolation for development. So nobody can deploy anything except through the development branch.

Dev: That's what development is for IMO, so it doesn't bother me.

Merge VS Rebase:
- Did you pick a side?
- Practical tips? Like dealing with merge conflicts
- Have you ever regretted using either?

My answer
* My team squash-merges all branches to master so we don't really care what the branch history looks like. Master history should be pretty - but a branch history can be ugly and filled with a dozen commits.
* Practical tip 1: use `git config rerere.enabled true`. rerere stands for "reuse recorded resolution" and this means if you rebase often you don't have to resolve the same merge conflict twice.
* Practical tip 2: use `git commit --fixup oldcommithash` and then rebase with `--autosquash`
* I like using Rebase. But I have regretted the amount of time I've spent on trying to rebase old branches with many commits only to give up and to `git rebase --abort` since I realised I couldn't handle trying to reapply all the commits chronogically as the changes in the 1st commit were no longer relevant.

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

Spent about six hours writing tests and coding a user log in system for a Rails app last night. Finally finished at around 2:00am. Commited, pushed and merged, then called it a night.

Woke up today and Postgres is refusing to play nice. Spent twenty mins or so fixing that and then ran rspec.... Two thirds of my tests are missing - everything I wrote last night. I check my code and sure enough, they aren't there.

Wild panic ensues for a solid 5 mins before I realise I didn't actually pull the updated master branch after deleting my feature branch last night.

Now I feel like an idiot, but a relieved one.

A custom script that makes a Jira ticket, assigns it to me, marks it as in progress, check out a git branch, set the commit title and the Jira title to my command line argument…. Push, open a PR, and fuck it, merge that shit too.

I checked all the corporate boxes and you got the typo fixed.

Deploying on stage.
Testing on stage.

Why does the issue persist on stage?

Testing on local. It is fixed!

Wtf?
Wtf!?
WTF???

Oh.

I did not merge my branch and deployed a new version on stage without any changes 🤦

It's Friday. I should go home.

My killer PR:
I made a small feature and it was to be merged in my senior's branch.
So I made it, resolved all the conflicts and when it got merged it broke my senior's branch.
This is nothing new and it happens, so me and him sat down and got it working. After two days, his branch got merged and broke it's parent 😂, after investigation my code was the reason, got fixed and merged.
Same thing happened 3 more times, and every time my code was the culprit.
Now for staging we thoroughly tested everything and deployed it, after running for 2 hours the piece of shit broke again 😂😂😂.
A meeting was arranged for scolding the team, and after the meeting the architect comes to me and say "how did you manage to fuck things on so many levels, literally?". I handled it like a pro with an awkward laugh.

We exhaustively checked it for production. Deployed, it did not broke, we were happy. After a month of successful run, I just joked about the above incident while we were working on next release on morning coffee. That cursed thing broke on the same evening. I was like 😮

First day back from holiday: after 30 minutes of work (excludes start-up, catch-up etc.) The P.O. (product owner) comes to me

Telling me I needed to switch project, ok I thought at least they switched the project from what ever it was to a propper OTAP street while I was away

Few tickets later the P.O. asked me if tickets x could be deployed to our test servers as well as production.. (note the ticket was already merged with our develop branch and he wanted only that single ticket x to be deployed)

WTF is the point of a OTAP street if you're going to deploy it to every server type at once?

So day one after my holiday I already needed to fight the P.O. again

At least I wasn't disturbed during my vacation... Witch is a first.

The current project I'm working with had 3 devs including myself until Jan 1st. Now we're only two, because our lead/manager started to work in other projects and trusted us.

Since that happened, my first PR/Commit of the year was in Jan 5, and it's still open, without any kind of review or comment, as well as my other five (eight in about a day) PRs, while he's making commits directly into develop/main branch, causing conflicts everywhere on what I did...

I'm leaving on friday because the contract is ending.

Good luck I guess.

!Rant
Awesomeness ensues!!!!!

I finally quit my day job at the place I was working to finally go full time with my business, TerraNimbus. I was able to secure a small loan to cover business and personal expenses until I can drum up enough business to keep things a float.

I’m super fucking stoked because I’ve been wanting to branch out and do this for about 4 years now and finally feel like I have the right pieces in play to make it work. I’m as nervous as hell but so fucking excited too!

I just needed to share this here cause the DevRant community is world class and you guys/gals are fucking killing it everyday being AWESOME!!! And you all feel like extended family members to me all going through the motions in each of your lives and keeping ‘in touch’ through devRant on a daily basis. So I wanted to share my story with everyone here.

*lunch break at work*
okay, let's play some dota...
*playing dota*
see crush eating, talking, flirting and having fun w/ someone... aaah shit heee weee go again 🤪 or not, whatever, I don't care, yeah, she's not my gf, I'm fine, everything is fine...
*a few minutes later*
client: hey, need this change right now
me: ok 👌
*keyboard sound*
ok, done, let's create a PR
*PR created*
me to myself: yeah, told ya
*PR merged*
me to myself again (I'm a sane person don't worry 😈): that was some badass code you wrote. see? I don't care about crush
*a few minutes later*
client: why the fuck did you ask to merge into master? (I created 33 PRs before and all were merged into the correct branch so they didn't check anymore)
me: *looking at crush 🙄*

Code review day 1:

Me: Where are these three templates being used? I don't see any class that uses them.

Him: Oh, yeah. My bad. I'll remove them.

(Time passes)

Him: I don't know what's going on with my branch. Please ignore the PR for now.

(Time passes)

Him: Is there any way for me to get the files from staging. I don't know what I did to my branch.

Me: Hang on. I'll push a copy of the one I have in a new branch.

He declines his PR and stops by to say he's going home but he'll open a new PR tomorrow and remove the unused files.

Code review day 2:

Him: Hey, do you know what happened to my PR? It looks like it disappeared.

Me: You declined it yesterday. Said you'd make a new one today without those extra files.

Him: Ooooh!

*working at a project, currently creating commits and pushing to remote

I created an early PR with a title [UNFINISHED] and [NOT YET DONE]. I'm really not finished yet. lots of stuff still need to be committed and pushed to repo

And suddenly, I find out that my team mate - just out of the blue without any prior warning - MERGES THE PULL REQUEST

"oh hey there are conflicts in the pr you made"

YEAH WELL MAYBE TRY GETTING YOUR HEAD OUT OF YOUR ASS WHAT IS WRONG WITH YOU ARE YOU EVEN SANE

So now what happened is half of my commits are merged, he didn't tell me, i pushed more commits, branch recreated, and then he reverts the merge. so now everything is really messed up :)AS)D(F)AEF)SDF)AW)sfdjsigkl;zfghlkkj ghaslkj;gabsd;lkgjabslkfgh GET YOUR HEAD OUT OF YOUR ASS I WANT A PROMOTION

Dev sent out a code review request.
I take about an hour, ask questions, make suggestions, general feedback, etc.

Today I noticed none of my questions were answered, developer closed the review, and the code merged into the production branch.

So I email him, asking him why the review was closed and why none of my concerns were addressed before merging to production.

Dev: "No one responded or left feedback, so I thought it was OK to merge up."
Me: "I reviewed and left feedback within the hour you sent the request."
Dev: "Oh yea...you did. Sorry. The code is already in production, but if you still want to leave feedback, create a work item, and I'll take a look."

No you won't.

An example of the code...The dev added an async method to a test harness *console app*. Why? .. check in comment was "Improves performance and enhances the developer experience.."
NO IT DOESN'T!

OK..that's off my chest. No one is getting punched in the face today.

I was asked to add full page takeover announcements to a website, even though there's a perfectly reasonable announcement system already in place.
I objected on religious grounds - doing that would undoubtedly get me sent to developer hell (also knows as COBOL).
But the client wasn't convinced so I made them a demo. I immediately got a message back saying "wow, that's a lot more annoying than I thought, please remove it".
Of course all of this was done in a separate branch, so this blasphemous code would never be in my master commit history.

3 teams pushing changes into my code branch, all of them with crazy amounts of errors. Why me?!

This is so annoying, I had 9 diff. jobs the past 2 years and this is my 10th and if this doesn't change I might reconsider my options again.

I came to work at a company that pays me like a Junior and treats me as an intern. My 20yo "boss" who acts as a project owner/lead dev doesn't want to learn anything new and sees any improvement as a waste of money. The problem is he thinks hes a great programmer but he doesn't know shit. Im mainly working on the Laravel installation because "I claimed I know Laravel". And its absolute garbage. They haven't used a single Laravel features besides routes and everything else is vanilla PHP. They write for loops that loop through $_REQUEST to remove a single character. Write 100 deep nested ifs and they abuse Elasticsearch to the point ES crashes because the program is using 1000 deep multidimensional arrays. Its only a webshop...

Everytime I try to make a suggestion like making the master branch protected, doing code reviews etc etc I get shut down because they are autistic and don't want anything to change.

I'm trying to bring some structure to the IT department, but I need help with something. I'm on my feature branch for some front-end stuff. I realize that there is some back-end missing that my colleague must do. How should we go about tackling this? Should he create another feature branch, fix the things, merge to master, and then i can merge from master?

if i work on PussyBranch to build up a feature, and DickBranch is my main branch so if i merge directly from Pussy into Dick and then work on Dick, and then switch to Pussy again then surely i wouldnt be able to commit to Dick because Pussy isn't filled up with the new code, right? I'd need to pull the latest code from Dick into Pussy branch. but what if i dont want to merge Dick into Pussy code? because what Dick contains, Pussy should not and that would cause anomaly and break uhh how do u call it, the purpose of the branch itself right. So if I want to work only on Pussy and commit just that segment of the new code into Dick, how do I do that? Do i have to force pushing Pussy code into Dick every time or can i do it without force command? serious answers only pls

also what alcohol is good for a more productive and longer hour coding sessions thx

Hmm. This code needs refactoring.
*recodes on Local and uploads*
Works on my branch.
*git push origin master and merge*
Works on Dev.
*deploy to Test*
Works on Test.
*deploy to Live*
Doesn't work.
*compares Live to Test, Dev, and Local*
No f$@%^%%$# difference!?!!

*quits development and lives under a bridge*

Made this amazing discovery in my project. Made sure to commit the code in Git to show a demo to the manager.

Could not find the code at all when it was time for the demo. Checked all the commits to find out, nope, no luck.

Later realized I committed that code to special branch :/ And I totally forgot about that :(

When I'm still a beginner in git, I always use git push origin <branch_name> --force, for the sake of pushing my code on the master branch. My co-worker always complain why the hell there's always conflict on the master branch.

My new team mates type in the date and time of commit on their commit messages and maintain code only on master branch. Some people deserve have their write access revoked.

So my colleagues don't proactively do PR reviews, even when they're assigned to them, unless asked for the n-th time by me or the PM.
In the meantime other PRs get merged, I need to merge master in my branch, and solve conflicts every time so that it is eligible for merging.
Additionally, while reviewing, the requierements engineer realizes that there were corner cases not initially covered in the ticket description, so I get review findings about covering these.

boss said: "we need create new version of our software. copypaste old version in new branch. so we will have dozens of versions and all of them online and working."
my question: "what if old bug will appear in all off 100500 branches? we will need fix all the versions of bug in different copies we have modified!"
boss said:"c'mon when we will get this problem then we will think about it. all the devs in world working on many versions. its easy."

your opinion?

Today was my last day before taking a week off from work. When I originally pushed my branch, GitHub knew I had 7 files changed. I squashed my commits and pushed so that there was one commit. GitHub then decided I had Infinity files changed. Fun way to end the week, posting “I *swear* that I didn’t just put up a PR for review before taking a week off that has Infinity file changes.”

My manager during my internship in 2007 was very prone to screaming.
She took the position, because more senior staff than her didn't want it and she wanted to be in charge of them.
When people didn't deliver the results she wanted she would call them in the office, start yelling them and saying they were incompetent and demean them. And even though we were a small open office, she would send us messages through MSN Messenger (it was the it thing back then), to check on our progress or ask us to go to her office which was the room next to us.
I met many wonderful people during my internship, but I was more than glad when it finished. A couple of years later I've learnt that the branch she was managing was terminated because everyone slowly started quitting. I can't imagine why...

I'm notoriously bad at Git. By that I mean I REALLY REALLY SUCK AT IT. And I have the curse of short memory and an even shorter ability to retain the how-to, muscle memory knowledge of things if too much time passes.

So, I was staring down the gullet of merging two separate repositories onto my local machine and then pushing the result to a remote server. Not having the benefit of someone else to bounce this off of, and always finding the usual Git docs too dense and obtuse, I turned to ChatGPT to help me sort it out.

Guys, where has this been all of my life? I know it's not perfect and it can make mistakes. I knew that going into it, so I made preparations in case this failed. BUT. IT. WORKED! I feel like it has put me into the Star Trek:TNG universe where I can say "Computer, do the thing." and it does that thing. Here's the prompt I used and which it answered perfectly.

"Play the role of a git coach. I have two git repositories. One is on Bitbucket. The other is on GitHub. The branch named "master" on Bitbucket has the latest code. The branch named "master" on GitHub needs to be updated to what's on the Bitbucket "master" branch. Please write the series of git commands that I will need to accomplish this."

First rant here..

So earlier this week, on a php Laravel project, I created a set of nice new features.

The code is tested, locally all fine, I push to Github, circleCi kicks in and double checks myself, still everything green. (Just for a not, its a private project so only I work on it.)

I go ahead and merge, deploy to staging and continue on my next ticket, which is a very small one.

I call it the day, next day I pick back up where I left, test locally, all green, push... then circleCi says no.

I spend 2 days debugging, trying to figure out what is wrong without advance. I just push develop branch again, guess what also failing.

I leave it for the day as I already spend enough time on it.

This morning, I simply do a composer update, push and everything miraculously starts working.. even if there were no changes in the working branches.

Im so mad right now, and this is going in my "try this before you debug a ci" book..

Nobody reviews my PR into test branch

The only guy who reviews it is the new senior dev who isn't yet used to how the company works, leaves comments about useless stuff and doesn't fucking approve

Jesus fucking Christ

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.

Just had someone branch off my repo of some class assignments I did last year.

What are they up to.....

Better not be doing what I think he's doing.

I waste 50 minutes reading tutorials and StackOverflow answers just to configure to my Git and GitHub account so that I can push the main local branch to the main remote branch from my terminal, and I still can't do it.

Fml.

ChaseBank is getting up my nose. Twice in four business days my account was flagged and I had to change my password for 'security' purposes. I spent the better part of 90 minutes in a futile attempt to find out why, when there's been no suspicious activity on my account, I'm being flagged. My father contacted a branch manager near him who told him to dial the priolrity customer service number and key in the letters (I shit you not) HO HO. I called the number. It's the same damn number I'd been calling. I called the branch. They told me I'd definitely receive a call back last Friday by 1800. No call. So, yesterday I called the manager of that branch, verified its location, told the manager he was supposed to call me by 1800 last Friday, and Chase Corporate would be in touch with him soon to explain that when you tell a customer you'll call them, you'll fucking call them.

I work on a team project for a test and maintenance course in University. We agreed as a team to adopt a git infrastructure that would prioritize the stability of the master branch at all cost by only updating commits up to the next stable point and tagging every single release. We have a long polling development branch to prepare our releases and we create feature branches for the tickets we need to resolve. I even wrote documentation to make sure that we don't forget and protected the master branch on gitlab from direct modifications.

Can someone fucking tell me how one of my teammates managed to fuck over all of this and work on an unfinished feature straight on master?

N.b. I know that he probably edited straight from gitlab's online text editor because they have a big where they don't restrict modifications on protected branches.

I'm still a junior myself, but some fundamentals I've told my coworkers:
* Commit more, regret less
* Yes, you can remove a commit, if something goes wrong.
* No, I'll not explain again how to undo a commit you pushed typo to you feature branch. Feel the shame of pushing "Fix typo" commits
* ask, if you are stuck or unsure.
* don't do deployments at 5pm Friday. 6pm results in less crashes in production for some reason /s
* Don't be like me. Go to sleep at appropriate times

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?

Why fucking my coworker push not compilable code on master branch??

Ok we are developing it, no yet release but I can't compile it for my tests.

My friend lost his job. Company closed brach he worked for. He was very depressed because it took him 2 days to find another job in different company while all his collogues had job offers the same day they find out about branch being closed.

Our Other it team asked me to create a new repository instead of a new branch in my project just cuz they thought branching would be more time consuming than maintaining a separate repo for emergency bug fixes.

what the fk how hard can it be to have a working version of the software on the master/ ros-version branch? Why is this thing always broken?! HOW?!

Had to update today unfortunately, and man, I have been "installing" this shit for over 3 hours now. Use the .install they said. It will be fast they said. Ye sure, my ass. The Dependencies are broken and incomplete as always and the tutorial is not up to date. Big suprise. I get it, it's a lot of work to keep these things up to date. But please if they are this broken and incomplete why are they released in the first place.
And then they wonder why I don't manage to do my work on time. Yeah, cause I'm stuck debugging this shit <.<'

If you're having merge problems I feel bad for you son, you've got 99 problems but my branch ain't one!

TEAM MATE: let me sync my branch with upstream master
*starts typing*

git pull upstream master

ME: Nooooooo!!!!

I worked as a freelance for a client and after working for more than a month, he owes me 1500$ and the payment was already due 15 days back
Today he even disconnected me on Skype which was the main source of communication
Now I want to undo my pull request which has already been merged in the master
I still have write access to the main repo, its on bitbucket
Is there any way i can destroy all my commits from the master branch or undo my merged pull so that he doesn't get any of the code
#helpwanted

I know we all hate FAANG companies here but I got invited to Amazon 5 hour interview(5 session here) after 2 technical i terviews and it feels good. It will also be in the domain I really want to work in.

But enough for good news, I want you to piss in my drink. Give me reasons to stay away from Amazon. Especially in European branch. What are they bad at? Why would people leave Amazon? Company gossips, I want to hear everything!

I wanted to make some changes to one project on GitHub. Forked, changed things ( in new branch), make PR, waited.

My PR got positive feedback, but was closed without merging.

Upon me asking why, I was banned from all their repos.

Inclusivity anyone?

Him: can we build something using which we can ensure that all the code related to all the rally user stories that have been tagged for a release, is part of the build?

Me: stares blankly

Him: you’re looking at me like I’m crazy. I’m looking for automating things to flag human mistakes.

Me (cursing silently): that’s why there are source control softwares and fucking code branches that get deployed and it’s not my problem if some shithead doesn’t merges his code to the central branch.

So.. We probably have thousands of rants on git and muggles here's one from me.

I've been roped into this ongoing project, guys with 1-1.5 years of experience are already working on it.

When they shared repo with me ...
I see 195 branches WTF! What are these idiots up to 🤔
And only handful of people working on project.

This one time I was merging branch with master ( branch #196) with master, guy sitting besides me asks me what I am doing I said it's good practice to pull before you push, right?(the line I remember reading here on devRant, I thought let's bee cool 😎 😋) And I explained him that I am merging 'em locally and will push once everything looks good ( I realized later that I shouldn't have wasted my couple of minutes explaining him)
He says don't waste your time and download (clone) the project folder(repo) from github and then paste or add your change to it.
Fuck you man, you should go fuck yourself instead of telling me that I'm wasting my time.

Sometimes I wonder, What do these guys think of github? Assholes, chutiya saale

Is it okay for me to fork my own repo to an alt account so I can have my multi-branch repo but not have to commit everything to the production repo right away?

Created a merge request for a big issue last week. Some dumbass co-workers merged several other stuff for tiny shit issues that lead to many merge conflicts now because they didn't pull before..
Nevermind.. will be merging develop into my branch for the third time now.. Got already 20h of extra work because no one minds to merge my request because it's so big and someone might have to check the commit messages what really happened..
Conflicts suck! Co-Workers suck!

Took a SWAG at stand-up this morning, saying I thought I could resolve a circular dependency introduced in a junior's branch by noon. As the morning dragged on, I became less and less certain of it, but lo! and behold I managed to refactor my way out of hell with 2 minutes to spare!

This calls for lunch beer! Which management has no way of stopping me from doing on a regular day due to remote working, but at least today I've convinced myself I earned it.

A pm asked about a feature I was developing and I went on to show them what I got so far. Feature-wise almost finished, but it still needed to be polished and thoroughly tested, as such it wasn't merged yet. Weeks later - I couldn't finish it yet for unrelated reasons - there was great confusion about why the feature is not there as it had been billed to the customer already. So I gotta pull some sunshine out of my ass and bring it to the last release branch..

Fucking unreal bro!!! I’m working on an issue and I pushed, then there was a bug, i fixed it again, another issue for the UI change, another fixed for sorting column. All that fixed I created separate branch. My boss called me and told me im stupid for creating a separate branch everytime on a simple fix, he told me that Git isnt used that way. He told me that his been doing this 30years already. So I asked isnt it the best practice to create a separate branch on every issue or if the branch has been merged? His answer is no. Fuck this guy and his 30years experience

I should’ve responded:
First of all, if we have a test suite then I would have notice that error but we dont. You dont even want to upgrade ruby and rails. We’re stuck at version 4 on rails. Second why are you merging my MR and reviewing it on IST? Why didnt you do that locally so you can address the issue before you merged? Third fuck you and your 30years

My actual response is:
Ahh yes sir, im sorry wont happen again, my bad, sorry for that mistake.

Fuck bro im mad!!!!

Pretty busy day at work today.. in the midst of everything, a co worker asked me to sync their branch on GitHub since they don't know how to.

Told them to commit any changes do that there wouldn't be any conflicts.

Their response: "you should already have my latest from 2 days ago"

.....
Two questions that I should have asked:

1) what have you been doing for two days?
2) why am I doing everything else?

:\

PLEASE RETROFIT THIS ISSUE TO THE BRANCH NOW! THIS NEEDS TO BE IN TODAY! NO EXCUSES!

Uhh, that would be ok if it weren't 40 commits over several JIRA issues in over 12 different modules... or if you had given me more than half a day to accomplish this task. But no. So here were are, at work at 7:30 pm spinning builds. Missing date night with my S.O.

And now the build is red.

Kill me.

So I thought I knew source tree, apparently I do not... Lost a week's worth of work, went to history, saw someone removed it with a commit, and now I'm getting blamed for my own work 'disappearing'. The reason I am being told I am to blame is how I control my branches... So how I do it is that I keep a local copy of the master branch, I keep it updated and monitor it for changes regularly (meaning fetch and pull cause double tap..) before I do a merge, I check for any new code on master again, then using the local copy of master, which I just updated, I pull the master changes into my branch, deal with any conflicts, build and done. Then I request my changes into master once I am happy everything is good.

My question is, clearly there is something wrong with the way I do things, so please source tree users, what is the most fool proof way to pull latest from master so that I don't loose code? 😔

Executing git commands you found online as proposed solution to your problem without checking what they do. Not even once.

Bruh, my heart is pounding. Almost lost the branch I've been working on for weeks to a force push

Yes ! Just copy paste an entire fucking react dashboard into our NextJs project !

But don't stop there mate. Fuck up your branch and mine too to a point even gitkraken can't tell me exactly what fucking operations you did.

This is my first Next project and my first time working with this new client and it's going tits up in less than a month. Fucking great job.

I forgot to create a branch and pushed directly to master...

Thankfully nobody reviews my code in this project or gives a shit anyways

First rant... I'm on a large project where en use Git. Apparently I am the only one who, after pulling the dev branch, do multiple local commits to track (and possibly) undo my local work before I merge into development again. Everyone else do ONE local commit. Am I gitting wrong?!

So after two and a half months of waiting 30-40 minutes for every build on the build server, and trying my best to start refactoring the hugeness of our main solution with limited success...

I discover that 2/3 of the build time is caused by the Get Source step deleting and getting EVERY BRANCH IN THE MAIN REPO!!!

This was taking 15-25 minutes. Every. Build.

I changed the build definition to map and cloak the repo correctly, so now the Get Source step takes less than a minute, and the whole build completes in 12-14 minutes...

Yowza! I guess that's a pretty good win to start my two week's vacation on ;-)

Today, my branch manager (vice president in the overall institution) sent an offensive and racist political meme to all employees at our site.

I was shocked and disgusted, as were many of my front-line colleagues. My immediate supervisors, however, shrugged it off. They agree that it is distasteful, but not enough to confront the prickly branch manager about it.

I believe that this sort of communication (which has nothing to do with the purpose of our nonprofit) would be seriously frowned upon by the overall organization’s CEO, were he aware. If this email was leaked to the press, it would reflect very poorly on our organization.

I feel compelled to speak up about this – but how? Confronting my branch manager directly – by myself – is pretty much guaranteed to go poorly for me. And organizing colleagues to action will no doubt be seen as troublemaking.

We have no HR to speak of. I’ve thought about forwarding the e-mail directly to our CEO, but that feels like tattling.

Lots of good suggestions up in here.

My personal prefference:

Such as there are governing bodies indiciating how a programming language evolves and a web consortium...there should be a computer science one. That dictates fundamental approaches covering everything that belongs to this wonderful branch of science. Everything from math to differenr scientific branches all the way down to turtles. And for it to be standarized and updated. Indeed, if you want to spend your entire existence gobbling js in the form of web sites then that is fine, but you should have sufficient knowledge to branch out into more academic pursuits if required.

Also, updated tools would be better, every aspiring computer scientist shall be able to navigate through all major operating systems and programming environments regardless of their beliefs and or prefferences and schools should provide said environments in their classrooms.

Data Strucrutes and Algorithms should be a must. Software engineering principles should be a must. Calculus, Algebra and Statistics as well as Physica should be a must.
And succesfully navigating over different engineering areas should be a must.

Not to cleanse the industry. Fuck your elitist mentality. If you think that programming is a sacred art that should exclude people then I really hope you fucking disapear from existence. No, not to cleanse. But to expand the industry and maybe show people that there is more than fucking around between node modules or gemsets.

Peace pendejos

**drops your mom's fatass...i mean mic**

Commit changes that is working perfectly.
Goes on vacation for 2 days.
Comes back to work and only half of my changes were merged to the test environment.
Also, the merge master decided to update my branch with the test branch.
Nice... now I have to redo most of my work.

CTO pointed out a typo in my branch. Agreenment.

I think I'll have to search for a new workplace 😢

Question: I completed a feature on separate branch. Since I'm not allowed to merge things on the master branch (only pm is allowed to) I open a pull request.

However, PM has decided that he will only accept PRs which can be automatically rebased & merged.

So now i opened my PR and PM says that GitHub complains that the branches cannot be automatically merged.

So I rebase the branch - push and tell him to try again. But the same issue - GitHub won't merge the PR. So I try again - rebase the feature branch onto master which runs me through the same rebase steps as on the last try. I successfully complete this one too and push. But still - GitHub won't swallow the PR.

Anybody an idea what could've went wrong here?

Why am i rejected to my own remote branch?!
Grrrr

!rant

Has any of you ever felt like you were going straight towards a burnout if you keep doing your actual job but consequently don't have any energy left during spare time to learn something new, new skills you would need to land a better job? Think changing programming "branch".

How/what did you do? I'm thinking of trying to get my boss to let me work less hours... But I honestly don't know if it would be enough.

Any advice?

Sorry for the downer post, I'll be back with shit my colleagues say soon enough ;)

Context: ive been porting a single threaded D.A.G scheduler into a lockless multithreaded one. Point is its an objectively complicated project where theres lots of overlap in the code and architectural boundaries are very fuzzy.

My boss: "Can you just make new branches for every 'large' change youve done. Its too hard to merge this one giant branch youve got"

Me: "Fuck bro, but this is 2 months worth of significant refactoring where the commits are not atomic and you told me way back then that it was cool to work in my own repo. Now ive got to go redo half my work"

Boss: "Well yea but isnt it so much better to work with clearly seperated histories"

Me: "yea its great if you tell me thats the workflow you want upfront. This is gonna suck but ill but my balls and dive into this pit of lava if u say."

Android Studio upgrade

Over the weekend I upgraded my android studio and the project files of my current project and all went smoothly (as far as I thought).
I did not touch the project till today as was implementing some few features only for some few unexpected bugs to creap in.Been implementing that feature for some time and thought would be done in a flash only to my disappointment.
Turns after upgrading my SDK they were some conflicting dependencies that had no idea of.
To make it worse my fall to branch was way behind the active one and had to create a new project from scratch and copy paste files.
All this after spending hours in Stack
Overflow and scratching my head.

Lesson learnt to commit more frequently.

After a couple of days reading bout CI/CD i find it really compilated for my usecase. Server for jankins server for rancher server for anything and a lot of configurations to make it work. So i gave up and decided to build my own CI tool which turned out to be easiear than all of this. So i wrote a simple cli tool in go which listens on master branch of every directory specified in a .yml file and everytime a new commit is done it pulls the repo and rebuilds the container. Pretty easy without having to deal with all the bullshit