When you merge the conflicted branch to master

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?

Me: I should make a new branch.
Inner me: push to master.

Please do rename the "master" branch to "Führer". The umlaut will probably catch a bunch of applications that aren't UTF-8 ready.

So I was code reviewing this guy's code before merging into the master branch.... and then I FOUND THIS FUCKING CODE, WHAT THE FUCK!!!!!!!!!!!!!!!! What the fuck is this ???

Never touch the master branch...

Thank you dear mr. boss for fucking up our master branch by adding local changes to a 2 months outdated master branch (250 FUCKING COMMITS BEHIND), pull the remote and then just push without resolving any conflicts!!!1!!!

But thank you so much for sending me an email at 10pm asking me to resolve the conflicts.

It is 3 in the morning and it took 1 hour to get it clean.

Sometimes I want to break some necks...

I wish we could branch out our lives like in git. Just fork at critical decision points, try out both/ multiple outcomes simultaneously, then reconcile and merge back into master.

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

rant? rant!

I work for a company that develops a variety of software solutions for companies of varying sizes. The company has three people in charge, and small teams that each worked on a certain project. 9 months ago I joined the company as a junior developer, and coincidentally, we also started working on our biggest project so far - an online platform for buying groceries from a variety of vendors/merchants and having them be delivered to your doorstep on the same day (hadn't been done to this scale in Estonia yet). One of the people from management joined the team working on that. The company that ordered this is coincidentally being run by one of the richest men in Estonia. The platform included both the actual website for customers to use, a logistics system for routing between the merchants, the warehouse, and the customers, as well as a bunch of mobile apps for the couriers, warehouse personnel, etc. It was built on Node.js with Hapi (for the backend stuff), Angular 2 (for all the UIs, including the apps which are run through a WebView wrapper), and PostgreSQL (for the database). The deadline for the MVP we (read: the management) gave them, but we finished it in about 7 months in a team of five.

The hours were insane, from 10 AM to 10 PM if lucky. When we weren't lucky (which was half of the time, if not more), we had to work until anywhere from 12 PM to 3 AM, sometimes even the whole night. The weekends weren't any better, for the majority of the time we had to put in even more extra hours on the weekends. Luckily, we were paid extra for them, but the salary was no way near fair (the majority of the team earned about 1000€/mo after taxes in a country where junior developers usually earn 1500€/month). Also because of the short deadline given to us, we skipped all the important parts like writing tests, doing CI, code reviews, feature branching/PR's, etc. I tried pushing the team and the management to at least write tests and make feature branches/PRs, but the management always told me that there wasn't enough time to coordinate and work on all that, that we'll do that after launching the MVP, etc. We basically just wrote features, tested them by hand, and pushed into the "test" branch which would later get tested and merged into master.

During development, one of the other juniors managed to write the worst kind of Angular code you could imagine - enormous amounts of duplication, no reusable components (every view contained the everything used in the view, so popups and other parts that should logically be reusable were in every view separately), fuck - even the HTML was broken (the most memorable for me were the "table > tr > div > td" ones, but that's barely scratching the surface). He left a few months into the project, and we had to build upon his shit, ever so slightly trying to fix the shit he produced. This could have definitely been avoided if we did code reviews.

A month after launching the MVP for internal testing, the guy working on the logistics system had burned out and left the company (he's earning more than twice the salary he got here, happy for him, he is a great coder and an even better team player). This could have been avoided if this project had been planned better, but I can't really blame them, since it was the first project they had at this scale (even though they had given longer deadlines for projects way smaller than this).

After we finished and launched the MVP, the second guy from management joined, because he saw we needed extra help. Again I tried to push us into investing the time to write tests for the system (because at this point we had created an unstable cluster fuck of a codebase), but again to no avail. The same "no time, just test it manually for now, we'll do that later when we have time" bullshit from management.

Now, a few weeks ago, the third guy from management joined. He saw what a disaster our whole project was. Him joining was simply a blessing from the skies. He started off by writing migrations using sequelize. I talked to him about writing tests and everything, and he actually listened. He told me that I'm gonna be the one writing them, and also talked to the rest of management about it. I was overjoyed. I could actually hear the bitterness in the voices of the rest of management when they told me how to write the tests, what to test, etc. But I didn't give a flying rat's ass, I was hapi.

I was told to start off by writing a smoke test for the whole client flow using Puppeteer. I got even happier, since I was finally able to again learn new things (this stopped at about 4 or 5 months into the project).

I'm using jest as the framework and started writing the tests in TypeScript. Later I found a library called jest-extended, but it didn't have type defs, so I decided to write them and, for the first time in my life, contribute to the open source community.

I just joined a company where all push to master branch. 🙄

If you do all your development in the MASTER branch, do not call yourself a git "Guru".

I stare through the blueish black backgrounds and blurry colorful syntax into a somewhat familiar office within a mirrored world. That damned reflective glass layer covering these meaningless pixels is certainly not on my side.

The rushing sound of transactions flowing through cables is silenced today. Some blood cloth in the invoicing system is zeroing out everything after the currency mark.

While sighing I spin a one-and-a-half pirouette on my desk chair — even when desperate, you shouldn't give up on style — I take three steps away from my screen and try to harmonize my thoughts.

So much noise, everywhere... Noise from within?

I have been stuck at the apogee of an inhale for a while now. Locked into some masochistic constriction, self-punishment for the blindness which stings my ego.

Just fucking take a deep breath you asshole...

I freeze in place, and fall backwards.

Patterns on the creamy drywall rapidly vibrate and synchronize on vivid rhythms of respiration and resonating basslines. Deep indigo rainbows ripple through tiny veins, in-between chalky grains, raining as fine magenta dust through the ceiling frames.

My bare feet slide over soft oscillating concrete, fine flows of unsievable sand surrounded by toes, toes surrounded by streaming variables veiled in obscure vile abstractions.

A jadegreen field of vectored compressions resiliently rumbles and bounces through the clearances and corners of the vibrant concrete office cave, whispering in tongues. I try to voice my woes in little blips and bleeps but I seem to be missing an asymmetric key to their shrouded sequenced speech.

Suddenly, a wild turbulence breaks up all signals.

Joanna floats by in her tipsy effervescent cloud of disordered black hair and alcohol perfume, one hand grasping grapes, her other waving at me.

With every finger she moves a thousand tensors propagating paradoxically flawed but perfect pieces of an intricate surreal picture, sketching whole constellations of possible paths throughout the leafs of the giant Ficus next to her desk.

She stops dead in her tracks, and asks somewhat hypocritically: "Are you high?"

I can not discern the meaning of her words, and respond stoically.

"Joanna! Check out those branches!".

"Pun intended?", she giggles.

I'm focused on her grapeless hand, her fingers stretching to reach the lush little tree.

On touch, the plant shivers, grappled in the tight net of the puppet master. She pulls her strings, applying measured weights, all nodes normalize, and Joanna speaks in an oddly soft tone:

"Isn't it beautiful, how so many models emulate nature"

Her cheek buried in foliage she babbles on about unbalanced search trees and machine learning models... but from the tips of her fingers tables and indexes flow into the plant. Users, payments, tariffs, invoices and taxes crawl over the bark, joining at thicker branches, joining at the stem....

Joining. JOINING. A JOIN.

"IF THERE'S NO FUCKING TAX MULTIPLIER IN THIS LEFT JOIN, EVERYTHING COALESCES TO ZERO" I shout at a perplexed Joanna who squeezes grape juice over her desk. I hop on the beat to my keyboard. She looks puzzled, hugs her Ficus tightly, and reaches for the whiskey bottle behind her monitor.

Attracted by my exclamation, Tom from finance swings open the door, while I push my branch.

I look at Joanna still half hiding between the leaves, and I laugh at her: "Branches! Oh, lame, I finally got it!"

Tom's heavy voice interrupts me: "Does this mean... does this mean that the invoicing bug is resolved?".

I smile at Tom with his tailored suit and waxed hair. "The money is flowing once more. All debts are being settled."

He releases his breath in relief, which he seems to have held since that morning as well.

Joanna adds: "Although I think he is forever indebted to my Ficus".

I nod.

Me: Damn it guys, you broke the master branch again.

*Fixes master branch*
*15 minutes later*

Coworker: Bro, master branch is broken again.

Me: Oh for fuck's sake, who did it this time?

Coworker: You did.

Me: I have become the very thing I've swore to destroy.

This was my day at work today
-Be me at work
-Use git terminal on WORK PROVIDED MacBook
-Decide to clone into a repo into another repo as it was one project inside another project
-Makes changes to code
-Attempts to add .
- warning: adding embedded git repo ...
-Apparently needs submodules
-Shit doesn't get added
-During this get asked to create 2 new branches and modify some code
-Do that specifying files to add as add . breaks everything
-Has 3 branches now detached from master
-Super confused where anything is and what's going on
-Go back to branch for other repo to get added to
-Spends 30 minutes trying to understand submodules
-Gives up and deletes folder moving it elsewhere
-Commits begin failing everywhere. Super confused.
-Get everything figured out and commiting
-Goto merge all branches to master
-Merge conflict with .DS_Store
-FML

I think I'm done guys

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

Always having a single branch, the master one 😅

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

It's good to know we are defeating racism.

"We all just commit to the master branch here."

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)

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.

We lost a frontend developer who used dozens of hipster libraries without any communications with other devs and replaced him with this one that has just pushed all the node_modules to master branch with all of her local config files. God. Fucking. Dammit.

When you accidentally commit and push under the wrong branch and the wrong branch in question is master.

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

I know i wont leave the office in time when i see someone pushing 40 commits to the master branch

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

Let the student use their own laptops. Even buy them one instead of having computers on site that no one uses for coding but only for some multiple choice tests and to browse Facebook.

Teach them 10 finger typing. (Don't be too strict and allow for personal preferences.)

Teach them text navigation and editing shortcuts. They should be able to scroll per page, jump to the beginning or end of the line or jump word by word. (I am not talking vi bindings or emacs magic.) And no, key repeat is an antifeature.

Teach them VCS before their first group assignment. Let's be honest, VCS means git nowadays. Yet teach them git != GitHub.

Teach git through the command line. They are allowed to use a gui once they aren't afraid to resolve a merge conflict or to rebase their feature branch against master. Just committing and pushing is not enough.

Teach them test-driven development ASAP. You can even give them assignments with a codebase of failing tests and their job is to make them pass in the beginning. Later require them to write tests themselves.

Don't teach the language, teach concepts. (No, if else and for loops aren't concepts you god-damn amateur! That's just syntax!)

When teaching object oriented programming, I'd smack you if do inane examples with vehicles, cars, bikes and a Mercedes Benz. Or animal, cat and dog for that matter. (I came from a self-taught imperative background. Those examples obfuscate more than they help.) Also, inheritance is overrated in oop teachings.

Functional programming concepts should be taught earlier as its concepts of avoiding side effects and pure functions can benefit even oop code bases. (Also great way to introduce testing, as pure functions take certain inputs and produce one output.)

Focus on one language in the beginning, it need not be Java, but don't confuse students with Java, Python and Ruby in their first year. (Bonus point if the language supports both oop and functional programming.)

And for the love of gawd: let them have a strictly typed language. Why would you teach with JavaScript!?

Use industry standards. Notepad, atom and eclipse might be open source and free; yet JetBrains community editions still best them.

For grades, don't your dare demand for them to write code on paper. (Pseudocode is fine.)

Don't let your students play compiler in their heads. It's not their job to know exactly what exception will be thrown by your contrived example. That's the compilers job to complain about. Rather teach them how to find solutions to these errors.

Teach them advanced google searches.

Teach them how to write a issue for a library on GitHub and similar sites.

Teach them how to ask a good stackoverflow question :>

All this "political correctness" cancer spreading through the Python community at the moment over "master/slave" terminology has me wondering where will it end. When the pendulum swings will be have a pro-life movement opposed to pre-emptively killing processes? Will a branch of PETA form to oppose the taxonomic appropriation of reptilian names for the language as a whole? Are we going to need to find gender-neutral names for motherboards to avoid offending those who are offended by the oppressive digital binary? Will removing "mother" from the name motherboard invite 6th wave feminists to decry the influence of toxic masculinity in electronics? Do snake lives matter? Seriously, some people need to take a month off to go fuck themselves somewhere far far away and stop confusing "diversity" with "rampant idiocy".

The "new guy" just merged master into a release branch.

The build server started bumping versions on the release branch and build "corrupted" installers.

Another developer had to spend a whole day trying to remove all the invalid commits.

I wish there is such thing as branch in a relationship. So that whenever a couple are having a fight, they can create a branch and work their shit out in that branch and eventually merge to the master branch.

Wait
Merge....
That just costs.... more conflicts

Soooo... Is it time to rename the master branch to something like "main"?

I just had a rather stressful morning. I should've known something was up by the sounds of thunder as I walked into the office.

I sat down and checked my emails. There was an email from the boss who was away on a business trip. The subject read, "CRITICAL BUG" and my name was mentioned. "Great...No time for coffee", was my first thought.

I began searching commits to see when and how the bug came to be. "SHIT! It was my fault", I said aloud.

(A bit of backstory, I am Irish, working in Germany with a B2 level of the German language.)

I now had to communicate the problem quickly with a senior developer who is Russian. He can't speak English well and I would not expect him to speak it. We are in Germany after all. I tried my best to communicate the issue, but I found it so difficult to understand his German in a Russian accent. Normally, in the office I speak German except when it is urgent and I must explain a problem in greater detail through English. I got past that obstacle, however, the real challenge of fixing the bug awaited.

After 2 hours of coding, I had a solution and committed it to the master branch. All the while, I had been replying to the bosses emails with updates, probably with many grammer mistakes.

We have no dedicated testers here and the code is written in a way which makes it very difficult to test (i.e. it was written many years ago). When I had initially written the code, I tested rigorously and found no issues.

Just needed to rant. I need a coffee break now...

That feeling when you finally successfully merge a branch that's 80+ commits ahead of master

I had to explain what version control was to the dinosaur last week. (Our cto, for more context check last post)

So we've been having issues getting our infrastructure dude to do deployment because he is sick of the treatment he gets here and has basically checked out.

Deployments then fell onto the dinosaur. After struggling for an eternity to figure out app settings (any junior dev could figure this out) he finally deployed, however it was from qa branch.

I gently reminded him that we were deploying from master and that all changes in qa should be merged to master when testing phase is over.

He informed me that 'he doesn't think that's a good idea because if we merge to master and there's problems then it's fucked forever and there is nothing we can do'

I stood there with my mouth hanging ajar until I finally managed to squeeze out 'that's literally what git is for....' 🤡

Project lead: Whats the name of your dev branch again?

Me: master

Project lead: ...

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.

1. Slack. Pretty good chat app for dev companies, I use it to prevent people standing next to my desk 40 times a day.

2. Unit testing tools, especially when fully automated using a git master branch hook, something like codeship/jenkins, and a deployment service.

3. Jetbrains IDEs. I love Vim, but Jetbrains makes theming, autocompleting & code style checks with mixed templating languages a breeze.

4. Urxvt terminal. It's a bit of work at the start, but so extremely fast and customizable.

5. Cinnamon or i3. Not really dev tools, but both make it easy to organize many windows.

6. A smart production bug logger. I tend to use Bugsnag, Rollbar or Sentry.

7. A good coffee machine. Preferably some high pressure espresso maker which costs more than the CEO's car, using organic fairtrade hipster beans with a picture of a laughing south american farmer. And don't you dare fuck it up with sugar.

8. Some high quality bars of chocolate. Not to consume yourself, but to offer to coworkers while they wait for you to fix a broken deploy. The importance of office politics is not to be underestimated.

"Server deployment is automated from git, so dont merge things into the master branch without permission"
Oh ok
>i create new branch
>push unfinished code because i gotta hurry
>server breaks
Well golly gee seems like you did a shit job at automating

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

```
Your branch is behind 'origin/master' by 562 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
```

`$ git pull`

```
251 files changed, 103274 insertions(+), 1361 deletions(-)
```
okay fuck.

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

Slack Boss: hey, could you check work of dev that is okey, we want this update fast.

Me: hey, just tell him to open PR and assign me, I will check and merge changes.

Slack notification: Dev: Hey, could you please merge Pull request on the project ?

Me thinking, hmm weird, I didn't get email.
Checking github, 0 pull request.

Me: hey, I don't see any pull request open, and when you make pr, just assign me I will merge it right away.

Dev: takes half a day

Dev: Makes pr and assign correctly me.

Dev on slack: HERE is PR open now @me.

I get 3 notification to see this PR, sure at least it is there.

I check this PR, 50 commits, X conflicts, cannot merge this.

Me: Hey, @dev please fix conflicts in your PR.

DEV: takes another 2 days to respond.

Boss in the meantime: hey, have you pushed those new changes ?
Me: I am waiting for conflicts to resolve.

Dev: I fixed the conflicts @me.
I check the PR conflicts are there.

Me: are you sure you pushed your changes @dev ? I don't see them resolved

Dev: takes another day and pushes changes to resolve conflicts.

Me: merges PR to master becaus he based it on master, I will sync the developer branch myself.

All good, everybody happy.

I write to dev: Next time base your changes on develop branch and resolve conflicts before making PR.

Two weeks later new PR From this dev.

Based on Master, conflicts everywhere.

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

Changing default branch name from "master" to "main" is just one more entry in the already very long list of "things sane people must do because some retarded american woke up one day and decided to be offended".
I am so fucking tired of the entire world having to accommodate to the first-world-problems of some spoiled brat just because they happen to be american.

You probably should commit the latest stable version before adding features to the master branch...

You dense motherfuxker. There is a reason why we create a separate feature branch, put our code there, check the CI and THEN merge that to master. The whole reason of merge feature to master is that the CI DOES NOT GET FUCKED UP! You never keep committing your feature changes directly to master. THAT'S HOW YOU FUCK THE CI UP.

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

Please, stop being afraid of git rebase.

Please stop merging master branch into feature branch just to fix pull request conflicts.

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.

Branch Manager without actual credentials (just a manager no real business decisions are made by him).

- Constantly is sick
- at home a lot doing „home office“ and not being responsive in company chat or emails
- is in home office 3-4 days a week while company policy clearly states one day a week
- watches YouTube a lot at work and calls out other people when they check their emails or quickly order something on amazon or maybe just listen to a podcast at work
- is a scrum master but rarely acts like it as in softens up rules as he sees fit
- backstabs employees in front of ceo when he actually entrusts them beforehand and says he is definitely in the employees side
- actually tried to physically intimidate me and another employee
- has no real technological background but chimes in on technical discussions and thinks it’s a new round of bullshit bingo
- does personal errands during work and books the time for it as work time
- claims people cheat on their time management entries and gets them warned and fired for it, while doing the exact thing himself
- knows he is trusted by the ceo but actually takes 0 interest in the future of the company
- tirades and gossips about other employees that just aren’t around at that moment
- is sexist at times
- very untrustworthy
- is responsible for a very toxic environment around the office

So that are his attributes - he got me warned and sacked because I supposedly committed fraud with my time management and caused the company financial harm - I had no projects or todos and was keeping myself busy with learning JS and python stuff instead of sitting around waiting for a ticket to come around.

Needless to say I’m glad I don’t see that guy any more. I’d break his jaw if I’d have to see him again.

Recently someone from QA came to me yelling "Why did you push to master? You have a feature branch for these changes..."

I replied "Indeed. Coincidently it's called 'master' "

Me looking at a 3 year old branch that needs to be rebased to current master

that moment when u forgot to switch branch first and ended up develop in master.

#Personal_Opinion

I'm still a little annoyed at the fact that GitHub started pushing us to name the first branch "main" instead of "master".

I fucking hate the fact that this group I'm side-hustling for gives maintainer access to every shitty dev they have.

Dev pushes four commits directly to master branch. Each time, pipeline fails on unit tests.

Shithead ignores failed tests and manually deploys to stage anyway.

Fuckface then declares (in group chat) that her "fix" works on stage and proceeds to merge to RC branch without updating the fucking unit test.

Pipeline fails (of course) and remains unfixed for the last EIGHT FUCKING HOURS.

This is what I woke up to at 6-fucking-AM in the god-damn morning.

*insert multiple expletives and insinuation of mother's excessive girth by comparing waistline to equator

In this company master branch is abused more than the hand brake in fast and furious

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 .

"four million dollars"

TL;DR. Seriously, It's way too long.

That's all the management really cares about, apparently.

It all started when there were heated, war faced discussions with a major client this weekend (coonts, I tell ye) and it was decided that a stupid, out of context customisation POC had that was hacked together by the "customisation and delivery " (they know to do neither) team needed to be merged with the product (a hot, lumpy cluster fuck, made in a technology so old that even the great creators (namely Goo-fucking-gle) decided that it was their worst mistake ever and stopped supporting it (or even considering its existence at this point)).

Today morning, I my manager calls me and announces that I'm the lucky fuck who gets to do this shit.

Now being the defacto got admin to our team (after the last lead left, I was the only one with adequate experience), I suggested to my manager "boss, here's a light bulb. Why don't we just create a new branch for the fuckers and ask them to merge their shite with our shite and then all we'll have to do it build the mixed up shite to create an even smellier pile of shite and feed it to the customer".

"I agree with you mahaDev (when haven't you said that, coont), but the thing is <insert random manger talk here> so we're the ones who'll have to do it (again, when haven't you said that, coont)"

I said fine. Send me the details. He forwarded me a mail, which contained context not amounting to half a syllable of the word "context". I pinged the guy who developed the hack. He gave me nothing but a link to his code repo. I said give me details. He simply said "I've sent the repo details, what else do you require?"

1st motherfucker.

Dafuq? Dude, gimme some spice. Dafuq you done? Dafuq libraries you used? Dafuq APIs you used? Where Dafuq did you get this old ass checkout on which you've made these changes? AND DAFUQ IS THIS TOOL SUPPOSED TO DO AND HOW DOES IT AFFECT MY PRODUCT?

Anyway, since I didn't get a lot of info, I set about trying to just merge the code blindly and fix all conflicts, assuming that no new libraries/APIs have been used and the code is compatible with our master code base.

Enter delivery head. 2nd motherfucker.

This coont neither has technical knowledge nor the common sense to ask someone who knows his shit to help out with the technical stuff.

I find out that this was the half assed moron who agreed to a 3 day timeline (and our build takes around 13 hours to complete, end to end). Because fuck testing. They validated the their tool, we've tested our product. There's no way it can fail when we make a hybrid cocktail that will make the elephants foot look like a frikkin mojito!

Anywho, he comes by every half-mother fucking-hour and asks whether the build has been triggered.

Bitch. I have no clue what is going on and your people apparently don't have the time to give a fuck. How in the world do you expect me to finish this in 5 minutes?

Anyway, after I compile for the first time after merging, I see enough compilations to last a frikkin life time. I kid you not, I scrolled for a complete minute before reaching the last one.

Again, my assumption was that there are no library or dependency changes, neither did I know the fact that the dude implemented using completely different libraries altogether in some places.

Now I know it's my fault for not checking myself, but I was already having a bad day.

I then proceeded to have a little tantrum. In the middle of the floor, because I DIDN'T HAVE A CLUE WHAT CHANGES WERE MADE AND NOBODY CARED ENOUGH TO GIVE A FUCKING FUCK ABOUT THE DAMN FUCK.

Lo and behold, everyone's at my service now. I get all things clarified, takes around an hour and a half of my time (could have been done in 20 minutes had someone given me the complete info) to find out all I need to know and proceed to remove all compilation problems.

Hurrah. In my frustration, I forgot to push some changes, and because of some weird shit in our build framework, the build failed in Jenkins. Multiple times. Even though the exact same code was working on my local setup (cliche, I know).

In any case, it was sometime during sorting out this mess did I come to know that the reason why the 2nd motherfucker accepted the 3 day deadline was because the total bill being slapped to the customer is four fucking million USD.

Greed. Wow. The fucker just sacrificed everyone's day and night (his team and the next) for 4mil. And my manager and director agreed. Four fucking million dollars. I don't get to see a penny of it, I work for peanut shells, for 15 hours, you'll get bonuses and commissions, the fucking junior Dev earns more than me, but my manager says I'm the MVP of the team, all I get is a thanks and a bad rating for this hike cycle.

4mil usd, I learnt today, is enough to make you lick the smelly, hairy balls of a Neanderthal even though the money isn't truly yours.

git branch maintenance.

Because certain people like to push to master.

dev: Can you add a master branch to the following Git repositories ? They are newly created and we don't see any branch.

me: Whaaattt are you asking ???

This is how the day started.

#quadruplefacepalm

+ “I’m drunk, but I can still drive.”
+ “I’m tired, but I can still finish this piece of code.”
+ " I don’t need a silly seatbelt.”
+ “Tests? Naw, I’ll just push this to the Master branch.”

> Worst work culture you've experienced?

It's a tie between my first to employers.

First: A career's dead end.
Bosses hardly ever said the truth, suger-coated everything and told you just about anything to get what they wanted. E.g. a coworker of mine was sent on a business trip to another company. They had told him this is his big chance! He'd attend a project kick-off meeting, maybe become its lead permanently. When he got there, the other company was like "So you're the temporary first-level supporter? Great! Here's your headset".

And well, devs were worth nothing anyway. For every dev there were 2-3 "consultants" that wrote detailed specifications, including SQL statements and pseudocode. The dev's job was just to translate that to working code. Except for the two highest senior devs, who had perfect job security. They had cooked up a custom Ant-based build system, had forked several high-profile Java projects (e.g. Hibernate) and their code was purposely cryptic and convoluted.
You had no chance to make changes to their projects without involuntarily breaking half of it. And then you'd have to beg for a bit of their time. And doing something they didn't like? Forget it. After I suggested to introduce automated testing I was treated like a heretic. Well of course, that would have threatened their job security. Even managers had no power against them. If these two would quit half a dozen projects would simply be dead.

And finally, the pecking order. Juniors, like me back then, didn't get taught shit. We were just there for the work the seniors didn't want to do. When one of the senior devs had implemented a patch on the master branch, it was the junior's job to apply it to the other branches.

Second: A massive sweatshop, almost like a real-life caricature.
It was a big corporation. Managers acted like kings, always taking the best for themselves while leaving crumbs for the plebs (=devs, operators, etc). They had the spacious single offices, we had the open plan (so awesome for communication and teamwork! synergy effects!). When they got bored, they left meetings just like that. We... well don't even think about being late.
And of course most managers followed the "kiss up, kick down" principle. Boy, was I getting kicked because I dared to question a decision of my boss. He made my life so hard I got sick for a month, being close to burnout. The best part? I gave notice a month later, and _he_still_was_surprised_!
Plebs weren't allowed anything below perfection, bosses on the other hand... so, I got yelled at by some manager. Twice. For essentially nothing, things just bruised his fragile ego. My bosses response? "Oh he's just human". No, the plebs was expected to obey the powers that be. Something you didn't like? That just means your attitude needs adjustment. Like with the open plan offices: I criticized the noise and distraction. Well that's just my _opinion_, right? Anyone else is happily enjoying it! Why can't I just be like the others? And most people really had given up, working like on a production line.

The company itself, while big, was a big ball of small, isolated groups, sticking together by office politics. In your software you'd need to call a service made by a different team, sooner or later. Not documented, noone was ever willing to help. To actually get help, you needed to get your boss to talk to their boss. Then you'd have a chance at all.

Oh, and the red tape. Say you needed a simple cable. You know, like those for $2 on Amazon. You'd open a support ticket and a week later everyone involved had signed it off. Probably. Like your boss, the support's boss, the internal IT services' boss, and maybe some other poor sap who felt important. Or maybe not, because the justification for needing that cable wasn't specific enough. I mean, just imagine the potential damage if our employees owned a cable they shouldn't!

You know, after these two employers I actually needed therapy. Looking back now, hooooly shit... that's why I can't repeat often enough that we devs put up with way too much bullshit.

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

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.

Name of the branches in a git repository are like

dev
dev-branch
dev-hotfix
dev-test
dev-merge
dev-app
dev-com
dev-com
dev-ref
dev-staging
dev-username1
dev-username2
dev-username3
.
.
.
.
.
.
Master

> git push origin master

* [new branch] master -> master

Thank you GitHub.

Other Dev: I worked really hard over the weekend to get the issue fixed, I raised a PR but it has a zillion merge conflicts. Would you mind taking a look at it?

Me: Ok. *Changes base branch away from Master.*

Other Dev: Whoa! How’d you fix them that so fast???

Me: Experience.

I should name my next master branch daddy

The moment when you made branch restrictions, but your colleagues just remove them so they are able to merge their branch into master.

I just merged master branch INTO my development branch. Fuuuuuuuck

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.

They renamed "master" to "main".

Finally! Slavery and racism are solved!

Our company is changing the default branch on our main repo from master to main.

We're literally on the verge of global genocide and a holocaust, and people are worried about over-sensitive people's feelings. I'm sure a branch change will end racism.

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.

Most of the work we do is committed into various branches. Everything is merged into the master branch.

Colleague was on vacation. I was working on a bug that was fixed by him some time ago. All I had to do was find the commit and merge it into the relevant branch. I didn't know which branch to search so I just looked into master. Search all commits on master made by colleague.

All I see is:

"Merged into master"
"Merged into master"
...
"Merged into master"

MERGED FUCKING WHAT INTO MASTER?

Current work project: Ok where is the master branch?
Coworker: Oh we lost that one a few months ago due to some merge conflicts...

There was an issue whilst you were away, we had to make a small css change.. We pushed it into master but it said something about the branch being behind the tip by 50 commits or something. It's okay, we forced it up though and force pushed it to production as well but the site went down.. In the end we had to ftp it up manually but the customer is saying things that were there before now aren't there any more?

I thought you put this "release process" in so things like this wouldn't happen! I think we need to review it as it clearly isn't working.

WATCH WHAT YOU CLONE!!!
I spent 2 days of stack overflow, assistance, mental counselling, 5 stages of depression ... just to realize I had cloned half the project because of a stupid, useless, fucked up branch that had the balls to call itself MASTER!!!!! arrggg!!!!!

Source tree opened

Finds new option 'cherry pick'

Wtf is this

Clicks on it

Wooow, there goes my master branch again

Minimal comments, no tests, push to Master branch... *Cough* though, this is all for personal projects, not team projects.

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

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?

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)

Aaaa stop this issue with renaming everything furcubimofawasggkdjgdkkf whitelist blacklist git blame and the master of em all, the main branch

Our marketing just change the blacklist/whitelist terms to blocklist/allowlist to make it more "neutral" following change in github "master branch" to "main branch"

When will this end, people ?
:/

You know what I god dam hate.

The likes of Microsoft, twitter and Github trying to change the English language and the definition of words based on your bad history.

How about, instead of banning words like Master branch and server slaves. You instead hand the language back to the English people and fix the spelling mistakes in all modern day programming languages!!!!

Talk about cultural appropriation!!

How to delete 16 days of commits 101 🤯:

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

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

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

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

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

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

When someone merges their own pull request and destroys the master branch

I used to work with a teacher in my last uni year.

The job consisted on doing a kinda-like management system for a business. It all began kinda "right", we agreed upon a price for 6 months of my work (a very lowball price, but it was just right because I was learning stuff that we were going to be using).

Fast-forward first six months, all I do is code frontend, mockup screens and whatsoever because this "business" hadn't give us proper requirements (Yeah, I told him to ask for them, but nothing came through).

So I was like well, I'll keep working in this project because I really want to finish it. Sidenote: I was doing all the "hard work", he didn't know how to code, and he calls himself a teacher... wtf).

Months go by, and a year goes round, in between these months, he spoke to me, that he wanted me that we kept working together, that we could renegotiate the payment (I asked him to give me my payment once the job was done). I agreed, but my uni residence period was coming along and I got an oportunity to go abroad to another country.

So there I was, in the need of money to buy my passport, plane tickets and other stuff, so I asked him for the payment.

Needs to be noted, that the last 6 months work was me doing tutorials on how to fucking use Linux, how to use PostgreSQL, how to fucking use CSS! He told me he would pay me extra for it.

The day came, and I received my payment... the exact amount we talked a year ago, I was like "Seriously dude?", but well, I needed the money and I didn't have time to argue, so we talked a little bit about me helping him and I told him "As long as I have time, I'll help, but remember that I'm going abroad to work for a small startup, so maybe I'll be up to my head with work" he agreed, we nod and then I left.

First week abroad came in and I was doing a shit-ton of stuff, then his first message comes around "Hey, I need more tutorials! ASAP! Before 6PM"

What.The.Fuck. I told you, son of a bitch, that I wouldn't be able to do them until weekend.. and it was monday!

So I ignored it, weeks went throught and my "angry mood" was fading away so I said to myself "Well, it's time to pick up that stuff again", I open Slack and I find a week old message with a document attached, it was a "letter", I just skimmed by it and read some keywords "deceptioned... failed me.."

Sure dude? Was I the failure? Becase, as far as I remember, you were the fucktard that didn't know how to fucking install a VM!

A week went by, and then randomly a friend of mine talks to me through Facebook:

E: Hey, how are you?
M: I'm fine, what's up?
E: What did you do to TEACHER?
M: Nothing, <explains all situation>
E: Well, It seems weird, that's why I wanted to talk with you, I believe in you, because I know you well, but TEACHER it's thrashing shit about you with all his students on all of his classes
M: Seriously?
E: Yeah, he's saying that you are a failure, irresponsible, that you scammed him

That moment, I for sure, lost all moral responsibility with him and thought to myself "He can go fuck himself with my master branch on his ass"

So when I got back to my country, I had to go around in school, avoiding him, not because I was ashamed nor anything by the way, just because I knew that If i ever had the disgrace to meet him face to face, my fists would be deep into his nose before he could say "Hey".

Moral of the story:
If you overheard that a teacher has a bad rep, not by one, nor two, but more than +100 people, maybe it's true.

Good thing my friends and others know me well and I didn't have repercutions on my social status, I'm just the guy that "fucked up TEACHER because I had the right and way to do it"

On today's episode of "Being the Company Git Guy":

"Good Day jallman112, can you ping me when you have a second? I'm having issues with merging our last branch back to MASTER in GIT. It's forcing me to resolve 400+ conflicts"

Sure. I'll get right back to you.

In a second.

Promise.

What the fuck gitflow

I feel like I must be doing this wrong

Everybody pushes to their own branch and then the team lead approves merge requests into the master

But everybody else sucks and nobody pushes to their branch even regularly let alone into master

So basically everyone’s working on their own version of the site it’s just a big fucking mess and I’m frustrated

New dev at our company. After two weeks he has finished a feature for a project. Want to merge it into the dev branch ... he worked in the master 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?

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

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

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

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

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.

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.

Every fucking day I'm asked some fucking stupid question that could have been easily figured if this fucker took 2 mins to look.

"Hey why isn't the issue closed with your commit message? Is it because the CI fail?"

No you dipshit. It's because it hasn't been merged into the master branch. And no the CI didn't fail. If you took 20 seconds to actually look into the pull request you'll see it passed.

God why?

Love it

when you fuck up a branch so hard you just make a new branch from master

Merge commits. Is it really that hard to keep your feature branch up to date with master?

I think I'm getting crazy...
Yesterday evening I finally thought it was a great idea to set up Gitlab CI to let the server build (ng cli) and deploy (via FTP) an Angular5 SPA on commits on the master branch.

BUT...

The npm package "vinyl-ftp" thinks it is pretty fucking funny to just randomly stop in the middle of uploading files or just upload some files with 0 bytes in size.

WHAT THE HELL?

After some hate infested trial and error, it seems that the more parallel channels I set up, the more chance I get that all files are correctly uploaded, but never all.

If anybody here happens to be some kind of mighty byte bender and knows what to do, I'd be thankful. But I will probably try out a different client in the docker image...

When I push to Master Branch

"Manager,, can we change the names of our master branch to main"

"It might upset the muscle memory of others"

👍 Our entirely white team.👍

*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 🙄*

Work story.
We have this system that's being used nation-wide and basically there's a control panel for management (it's a website)) and an app for the regular users.

I just migrated and replaced the guy before me, I'm basically the only one on the project.

The code for the website is a mess, the servers are sometimes slow, and few security problems here and there.

Project Lead comes up to me and says that few of our clients that use the website are saying it works really slowly.
I start by analyzing the networking, and found shocking things.
First of all, let's say there's a messaging option, and the management teams that are our clients can have each a lot of groups, which all have messaging.

Upon first load, ALL OF THE IMAGES, FROM ALL GROUPS, ARE PRE LOADED. It can get up to few hundred photos being preloaded upon first load, which can explain the slow loading.
After discovering that, I discovered that the Administration control panel, which only my project lead can access, with sends heavy requests to the server and loads heavy assets, is loaded every time to every single client, generating heavy stress on our server and slowing everything down.

I tell that to my project lead and say that that's what causing the slow downs, I coded a fix that currently sits and is not being merged to the master branch to be deployed, and somehow I need to find a way to fix the slowness which all comes down to the heavy requests and slow connection with servers... And they won't merge my fix that fixes the loading of the administration panel so the stress on the servers could go down, and everything will be sped up....
Ah damnit.. sometimes I don't understand it..

When you just merge master into development branch and whole Jenkins wall turns red. Wtf? Wasn't me bro.. o.O

Today's task - trying to work out if the guy who set up his repository using "mane" as the main branch name genuinely can't spell, just likes horses, or is just trying to push back against the recent trend of not using "master" 😂

soy eating developer: * change the name of his master branch to "main" *

Me: That's it, you ended racism!

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*

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.

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.

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.

Long time ago i ranted here, but i have to write this off my chest.

I'm , as some of you know, a "DevOps" guy, but mainly system infrastructure. I'm responsible for deploying a shitload of applications in regular intervals (2 weeks) manually through the pipeline. No CI/CD yet for the vast majority of applications (only 2 applications actually have CI/CD directly into production)

Today, was such a deployment day. We must ensure things like dns and load balancer configurations and tomcat setups and many many things that have to be "standard". And that last word (standard) is where it goes horribly wrong

Every webapp "should" have a decent health , info and status page according to an agreed format.. NOPE, some dev's just do their thing. When bringing the issue up to said dev the (surprisingly standard) answer is "it's always been like that, i'm not going to change". This is a problem for YEARS and nobody, especially "managers" don't take action whatsoever. This makes verification really troublesome.

But that is not the worst part, no no no.

the worst is THIS:

"git push -a origin master"

Oh yes, this is EVERYWHERE, up to the point that, when i said "enough" and protected the master branch of hieradata (puppet CfgMgmt, is a ENC) people lots their shits... Proper gitflow however is apparently something otherworldly.

After reading this back myself there is in fact a LOT more to tell but i already had enough. I'm gonna close down this rant and see what next week comes in.

There is a positive thing though. After next week, the new quarter starts, and i have the authority to change certain aspects... And then, heads WILL roll on the floor.

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.

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.

Master branch !

I don't think "main" is the best replacement for "master" on GitHub, I mean Git already uses branches so why not continue with the whole tree analogy and call it the "root" branch?

I know I’ll get mixed views for this one...

So I’ll state my claim. I agree with the philosophy of uncle bob, I also feel like he is the high level language - older version of myself personality wise.. (when I learned about uncle bob I was like this guy is just like me but not low level haha).

Anyway.. I don’t agree with everything because I think he thinks or atleast I get the vibe he thinks everything can be solved by OOP, and high level languages. This is probably where Bob and I disagree. Personally I don’t touch ruby, python and java and “those” with a 10 foot pole.

Does he make valid arguments, yes, is agile the solve all solution no.. but agile ideas do come natural and respond faster the feedback loop of product development is much smaller and the managers and clients and customers can “see things” sooner than purly waterfall.. I mean agile is the natural approach of disciplined engineers....waterfall is and was developed because the market was flooded with undisciplined engineers and continues to flood, agile is great for them but only if they are skilled in what they are doing and see the bigger picture of the forest thru the trees.. which is the entire point of waterfall, to see the forest.. the end goal... now I’m not saying agile you only see a branch of a single tree of the forest.. but too often young engineers, and beginners jump on agile because it’s “trendy” or “everyone’s doing it” or whatever the fuck reason. The point is they do it but only focus on the immediate use case, needs and deliverables due next week.

What’s wrong with that?? Well an undisciplined engineer doing agile (no I’m not talking damn scrum shit and all that marketing bullshit).. pure true agile.
They will write code for the need due next week, but they won’t realize that hmm I will have the need 3 months from now for some feature that needs to connect to this, so I better design this code with that future feature in mind...

The disciplined engineer would do that. That is why waterfall exists so ideally the big picture is painted before hand.

The undisciplined engineer will then be frustrated in the future when he has to act like the cool aid man thru the hard pre mature architectural boundaries he created and now needs links or connections that are now needed.

Does moving to agile fix that hell no.. because the undisciplined engineer is still undisciplined.

One could argue the project manager or scrum secretary... (yes scrum secretary I said that right).. is suppose to organize and create and order the features with the future in mind etc...

Bullshit ..soo basically your saying the scrum kid is suppose to be the disciplined engineer to have foresight into realizing future features and making requirements and task now that cover those things? No!
1 scrum bitch focuses too much on pleasing “stake holders” especially taken literally in start ups where the non technical idiots are too involved with the engineering team and the scrum bastard tries to ass kiss and get everything organized and tasks working so the non technical person can see pretty things work.

Scrum master is a gate keeper and is not needed and actually hinders the whole process of making a undisciplined engineer into a disciplined engineer, makes the undisciplined engineer into a “forever” code grunt... filling weekly orders of story points unable to see the forest until it’s over because the forest isn’t show to the grunt only the scrum keeper knows the big picture..... this is bad this is why waterfall is needed.

Waterfall has its own problems, But that’s another story for another day..

ANYWAY... soooo where were we ....

Ahh yess....

Clean code..

Is it a good book, yes.. does uncle bobs personality show thru the book .. yes lol.
If you know uncle bob you will understand what I just did with this post lol. I had to tangent ( at least mine was related to the topic) ...

I agree with the principles of the book, I don’t agree with the extreme view point. It’s like religion there’s the modest folks and then there are the extremists. Well he’s the preacher of the cult and he’s on the extreme side.. but that doesn’t mean he’s wrong.. many things he nails... he just hits the nail thru the wall just a bit.

OOP languages are not the solution... high level languages do not solve everything.. pininciples and concepts can be used across the board and prove valuable.. just don’t hold everything up like the 10 commandments of which you cannot deviate from.. that’s the difference here I think..

Good book, just don’t take it as the Bible as a beginner, actually infact DONT read this book as a beginner. Wait a bit learn then reflect by reading this.

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

That moment when the code doesn't compile due to an error in a different module that you never touched after merging the master branch into yours...

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 think companies are not going more and more woke but they are appeasing to the crybabies so their profits won’t diminish in the long term.

So they are doing something worse, knowing the demands of these highly offended crowd are bullshit but they prefer to look like they agree with them, so some retard do not start a twitter thread about how github supports slavery by naming default branch master.

In the meantime, this appeasement emboldens and make those children bolder demands, like a baby wailing inside a mall to force parents to buy a candy.

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?

Webpacker works on branch master.

Webpacker doesn't work on the "back-end" branch.

I didn't touch anything javascript related between the branch's creation and now.

Why. Why why why why why.

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 was asked to make proof of concept small frontend app with some simplified requirements, they asked me because it should be written in the stack I done most of my career work with. I do it in 3 days instead of 5, using those 2 days to optimise the app and explore different approaches. I noted down my findings, what to avoid and reasons and also what is good to use and reasons and shared with everyone.

We waited for the project to start, I started working on another project in the meantime and there was a big rush to make project go live etc., so I was consumed 100% on that new project.

So they put in charge backend php developer to do frontend js work. I said ok, do you need help in starting out? Nah, my proof of concept repo is enough.

4 days before that small project goes live they asked me to do code review. All things I noted down to avoid are in the codebase, few bad practices but everything is over-engineered (in a very bad way), some parts should be more flexible as current setup is very rigid, having almost all kinds of CSS, I saw SASS, CSS variables, 2 different CSS-in-JS tools with some additional libraries that is used to toggle classes.

I don't know how to approach this as I am not asshole as a person and I don't want to say to my colleague that his codebase is completely trash, but it is.

The worst parts: They called me to help finish the app and budget is almost spent!

I would rewrite the whole app as the state of the current app is unusable and everything is glued with bad Chinese ducktape that barely holds.

Additional points because it won't bundle as everything is f**ked.

I am seriously thinking of duplicating master branch and refactor the whole fricking app but won't do that as I am burning midnight oil on other two projects. Don't worry overtimes are paid.

I hate those shitty situations, this project was supposed to be tiny, sweet and example of decent project in this company but it is instead big fat franken-app that will be example how smart it is to avoid putting backend dev to do frontend work (I also agree for vice versa)!

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

git pull upstream master

ME: Nooooooo!!!!

NEVER maintain multiple release branches as a maintainer, period.

Given enough PRs, nobody, not even god-tier maintainers, is able to keep track of all commits and the whole context/story behind it.

Remember that people ALWAYS PR against your master and nobody even cares about your whatever-named-next-branch buried deep inside your feature branches.

Please make it easy for others if you want actual contributions.

Biggest sin? Easy. Pushed directly to master branch and deployed to prod. I should mention it was something very small before I get crucified😂

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

# always be pruning
git fetch -p

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

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

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.

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.

Is it just me, or does anyone else find it extremely satisfying completing a successful git push -u origin master?

Did the MIT seriously just take down one of their own huge tiny image datasets for machine learning because of the same problem as GitHub's Master branch?

I watched the movie 'happy deathday' today. It really isn't a horror movie but I was thinking of version control the whole time.

The point where she wakes up all the time is the master branch and the different days she experiences are different branches.

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

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

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

My team is the meme of the coding dinosaurs.... they think git basics like working in a branch and doing pr's and not commit directly to master is a "theory", they use old and unknown shit for everything and even when said shit has a better way of doing something they just choose the worst one. At the moment they have me changing all the files in multiple apps from tab indentation to spaces because this generates a code coverage issue on sonar instead of just deactivating that check... why the fuck did I take this job whyyyyyy

15 mins before the Production Release, after accidentally merging the Dev branch with the Master one :)

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

Hey DevRant, this is my first time working collaboratively on a project with Git and I'd like to know what's the best strategy to adopt.

Is it that every member has their own branch on origin that they push to, then we meet and plan out merges when it's time to release? Or does everyone just push to master, but stash or commit their local changes before they pull?

It's a Greenfield project, with just a bare repository on the central server. It's an MVC app where I've decided to do the View & Controller portions and the other person is doing Models and data services layers.

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?

3 months old branch! And I have to resume work on it! git pull origin master ….. fuck me!!

So today my colleague is installing new dependency to our react native project and do something cool with it.

Him: I already push it in new branch and make a pr, would you review and merge it to master.
Me: ok let me try first.
.
.
Me: it is not working, i get this error.
Him: try change these xxx in xcode.
Me: ok, wait.
.
.
Me: now I get this error
Him: hmm... Try 'react-native link xxxx'
Me: ok
.
.
Me: I get same error like first error.
Him: now try 'react-native unlink xxxx'
Me: hmm... Wait.
.
.
Me: I still get same error, what's wrong?
Him: I don't know, it's working in my mechine .

*Me 'git reset - - hard' and try to build again.
**After building

Me: hey it's working after I git reset lol.
Him: nice
Me: let me clone it and try 1 more time.

*after cloning and building
.
.
Me: I still get same error like 1st error hahaha.
Him: so try to 'react-native link xxx' again.
Me: OKkK
.
.
Me: still get same error
Him: try git reset and build again
Me: hmm
.
.
*after git reset and build again
Me: I still get same error. I think the correct steps is :
1. Clone
2. Do something in xcode
3. React native link
4. React native unlink
5. Git reset - - hard
6. Build

I can't stop laughing 😂🤣😂🤣🤣😂🤣😂

story of a release
v2.1.0 major changes went live : new features, bug fixes, optimisations. also included releases for 2 associated libraries
release process tasks:
- do code
- update test cases
- test sample app
- test on another sample app
- get code reviewed and approved by senior ( who takes his own sweet time to review and never approves on first try)
- get code reviewed again
- merge to develop after 20 mins( coz CICD pipeline won't finish and allow merging before that)
- merge to master after 20 mins( coz CICD again)
- realise that you forgot to update dates in markdown files as you thought the release will be on 10th sept and release is happennig on 12th sept coz of sweet senior's code fucking/reviewing time
- again raise a branch to develop
- again get it a review approval by sr (who hopefully gives a merge approval in less time now)
- again get it merged to develop after waiting for 20 mins
- again get it merged to master after waiting for 20 mins
- create a clean build aar file
- publish to sonatype staging
- publish to sonatype release
- wait for 30 mins to show while having your brain fucked with tension
- create a release doc with all the changes
- update the documentation on a wyswig based crappy docs website
- send a message to slack channels
- done

===========

why am i telling you this? coz i just found a bug in a code that i shipped in that release which still got in after all the above shitty processes. its a change of a 3 lines of code, but i will need to do all the steps again. even though i am going through the same shitty steps for another library version upgrade that depends on this library 😭😭

AND I AM THE ONE WHO CAUGHT IT. it went unnoticed because both of those shitty samples did not tested this case. now i can keep mum about it and release another buggy build that depends on it and let the chaos do its work, or i can get the blame and ship a rectification asap. i won't get any reward or good impression for the 2nd, and a time bomb like situation will get created if i go with 1st :/

FML :/