When you merge your own pull request....

When you merge 8 pull requests and everything worked without any conflict.

*We colleagues were cursing Valentine's week*

Team Lead : Committed?
Me: No, I am single.
TL: *confused look* Did you committed that code?
Me: ohh yes! I raised the merge request as well.
TL: Ok. I will review it. *Moves away smiling inside*
Me: *looking at screen* *crying inside*

You don't have to fix your pull request if you directly merge it into master.

That moment when u created a project and quite some folks forked it and continued their own versions, but then you realised that you've made a little mistake back then so now your dumb code propagated across humanity.

¯\_( ͡° ͜ʖ ͡°)_/¯

Merge request

Title: Fix bugs
178 files, +615, -743

And it had passed review by not one, but two (allegedly) intelligent people.

HOW. THE. FUCK?!

Luckily I am overtaking that domain and won't allow such bullshit. Mainly because I will be the author of the commits.

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!

Just got a merge request to review. It's TERRIBLE

- 93 changes
- 23 commits
- includes multiple features
- includes new project configs
- includes refactoring

NO. Please don't do that.

Do smaller commits. One feature per MR. It will help you and the reviewer :D

I tell him to submit a pull request, he just merges his code. I revert it and tell him to submit a pull request, he submits one then merges it himself immediately after...

Indian web dev company (during the interview)::
We follow standards

Me:: Hey, can I get the project's github link so that I can fork it, do my tasks, run test cases, push and, make pull request that you can review, run integration test, and finally merge.

Indian web dev company:: What?? Here's the ftp credentials.

Me::

3:30 on a Friday, random PM: our Argentina devs just sent out a merge request. We need to release before the weekend.
me: We try not to release on Friday afternoon unless it's for a high priority bug fix.
PM: This is urgent
me: why?
PM: We're two weeks behind schedule and the dev for this it's going on vacation in an hour.
me: so, you want to release when there's no one around if something goes wrong and the person who knows anything about it isn't contactable?
PM: yes
me: no.

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.

"I'm almost done, I'll just need to add tests!"

Booom! You did it, that was a nuke going off in my head.

No, you shouldn't just need to add tests. The tests should have been written from the get go! You most likely won't cover all the cases. You won't know if adding the tests will break your feature, as you had none, as you refactor your untested mess in order to make your code testable.

When reading your mess of a test case and the painful mocking process you went through, I silently cry out into the void: "Why oh why!? All of this suffering could have been avoided!"

Since most of the time, your mocking pain boils down to not understanding what your "unit" in your "unit test" should be.

So let it be said:

- If you want to build a parser for an XML file, then just write a function / class whose *only* purpose is: parse the XML file, return a value object. That's it. Nothing more, nothing less.
- If you want to build a parser for an XML file, it MUST NOT: download a zip, extract that zip, merge all those files to one big file, parse that big file, talk to some other random APIs as a side-effect, and then return a value object.

Because then you suddenly have to mock away a http service and deal with zip files in your test cases.

The http util of your programming language will most likely work. Your unzip library will most likely work. So just assume it working. There are valid use cases where you want to make sure you acutally send a request and get a response, yet I am talking unit test here only.

In the scope of a class, keep the public methods to a reasonable minimum. As for each public method you shall at least create one test case. If you ever have the feeling "I want to test that private method" replace that statement in your head with: "I should extract that functionality to a new class where that method public. I then can create a unit test case a for that." That new service then becomes a dependency in your current service. Problem solved.

Also, mocking away dependencies should a simple process. If your mocking process fills half the screen, your test setup is overly complicated and your class is doing too much.

That's why I currently dig functional programming so much. When you build pure functions without side effects, unit tests are easy to write. Yet you can apply pure functions to OOP as well (to a degree). Embrace immutability.

Sidenote:

It's really not helpful that a lot of developers don't understand the difference between unit, functional acceptance, integration testing. Then they wonder why they can't test something easily, write overly complex test cases, until someone points out to them: No, in the scope of unit tests, we don't need to test our persistance layer. We just assume that it works. We should only test our businsess logic. You know: "Assuming that I get that response from the database, I expect that to happen." You don't need a test db, make a real query against that, in order to test that. (That still is a valid thing to do. Yet not in the scope of unit tests.)

How the hell does PR containing production secrets and private keys gets 3 approvals and gets merged upstream? 😬 🥴

"My merge request has cr fail. But still please accept and merge into master"

> make a merge request
> it gets reviewed one month later
> "I can't accept it there's too many conflicts"

Well wouldn't you say that, maybe next time try accepting the MR when I make it and see how that goes

(New account because my main account is not anonymous)
Let's rant!

I'm 3 exams away from my CS degree, I've chosen to do some internship instead of another exam, thinking was a great idea.

Now I'm in this company, where I've never met anyone because of pandemic. A little overview:
- No git, we exchange files on whatsapp (spicy versioning)
- Ideas are foggy, so they ask for change even if I met their requirements, because from a day to another they change
- My thesis supervisor is not in the IT field, he understands nothing

The first (and only) task they gave me, was a web page to make request to their server, fetch data etc.
Two months passed trying to met their requests, there were a lot of dynamic content changin on the page, so I asked if I could use some rendering framework to make the code less shitty, no answers.
I continued doing shitty code in plain JS.

Another intern guy graduated, I've to mantain his code. This guy once asked me "Why have you created 8 js modules to accomplish the web page job?", I just answered saying that was my way of work, since we're on the same level in the company I didn't felt to explain things like usability, maintainability etc. it's like I've a bit of imposter syndrome, so I've never 100% sure that my knowledge is correct.
Now we came at the point where I've got his code to mantain, and guess what:
900 lines of JS module that does everything from rendering to fetching data..

I do my tasks on his code, then a bug arises so the "managers" ask him what's happened (why don't you ask to me that I'm mantaing is code!?!?), he fixes the bug nonetheless he finished his intership. So we had two copies of the same work, one with my job done and still with his bug, and another one without my work and without the bug.
I ask how to merge, and they send me the lines changed (the numeration was changed on my file ofc, remember: no git...)

Now we arrive today, after a month that they haven't assigned any task to me and they say:
"Ok, now let's re-do everything with this spicy fancy stunning frontend framework".
A very "indie" Framework that now I've to study to "translate" my work. A thing that could be avoided when I've asked for a framework, 2/3 MONTHS AGO.

Instruction unclear

I was checking out this wk139 rants & thinking to myself how does one have a dev enemy.. o.O Well TIL that maaaaybe I have one too..

Not sure if ex coworker was a bit 'weird & unskillful' or wanted to intentionally harm us and thank god failed miserably..

I decided to finally cleanup his workspace today: he had a bad habit of having almost all files in solution checked out to himself, most of them containing no changes whatsoever... I reminded him on many occasions that this is bad practice & to only have checked out files he was currently working on. And never checkin files without changes.. Ofc didn't listen.. managed to checkin over 100 files one time, most of which had no changes & some even had alerts for debugging in them.. which ofc made it to the client server.. :/

On one or two occasions I already logged in and wanted to check if files have any real changes that I'd actually want to keep, but gave up after 40 or so files in a batch that were either same or full of sh..

Anyhow today I decided I will discard everything, as the codebase changed a lot since he left an I know I already fixed a lot of his tasks.. I logged in, did the undo pending changes and then proceed to open source control explorer.

While I was cleaning up his workspace, I figured I could test what will happen if I request changeset xy and shelveset yy, will it be ok, or do I have to modify something else & merge code.. Figured using his workspace that was already set up for testing would be easier, faster & less 'stressful' than creating another one on my computer, change IIS settings and all just, to test this merge..

Boy was I wrong.. upon opening source control explorer, I was greeted by a lot of little red Xes staring back at me... more than half the folders on TFS were marked for deletion.. o.O

Now I'm not sure if he wanted to fuck me up when he left or was just 'stupid' when it comes to TFS. O.O

So...maybe I do have a dev enemy after all.. or I don't.. Can't decide.. all I know for sure is tomorrow I'm creating another workspace to test this and I'm not touching his computer ever again.. O.O

I was asked to fix a critical issue which had high visibility among the higher ups and were blocking QA from testing.

My dev lead (who was more like a dev manager) was having one of his insecure moments of “I need to get credit for helping fix this”, probably because he steals the oxygen from those who actually deserve to be alive and he knows he should be fired, slowly...over a BBQ.

For the next few days, I was bombarded with requests for status updates. Idea after idea of what I could do to fix the issue was hurled at me when all I needed was time to make the fix.

Dev Lead: “Dev X says he knows what the problem is and it’s a simple code fix and should be quick.” (Dev X is in the room as well)

Me: “Tell me, have you actually looked into the issue? Then you know that there are several race conditions causing this issue and the error only manifests itself during a Jenkins build and not locally. In order to know if you’ve fixed it, you have to run the Jenkins job each time which is a lengthy process.”

Dev X: “I don’t know how to access Jenkins.”

And so it continued. Just so you know, I’ve worked at controlling my anger over the years, usually triggered by asinine comments and decisions. I trained for many years with Buddhist monks atop remote mountain ranges, meditated for days under waterfalls, contemplated life in solitude as I crossed the desert, and spent many phone calls talking to Microsoft enterprise support while smiling.

But the next day, I lost my shit.

I had been working out quite a bit too so I could have probably flipped around ten large tables before I got tired. And I’m talking long tables you’d need two people to move.

For context, unresolved comments in our pull request process block the ability to merge. My code was ready and I had two other devs review and approve my code already, but my dev lead, who has never seen the code base, gave up trying to learn how to build the app, and hasn’t coded in years, decided to comment on my pull request that upper management has been waiting on and that he himself has been hounding me about.

Two stood out to me. I read them slowly.

“I think you should name this unit test better” (That unit test existed before my PR)

“This function was deleted and moved to this other file, just so people know”

A devil greeted me when I entered hell. He was quite understanding. It turns out he was also a dev.

The company I work at sends their developers out to other companies to help them work on projects and help them in other ways (advice when communicating to customers of on demand software for example).

While not on a project you are working in house training trainees and interns. Part of that is teaching them to show initiative and treating them as full developers. The 30 interns all discussed a git flow and code format.
During the third sprint (two weeks sprints) a team messaged me if I wanted to check their merge request for the sprint.

It took me a glance at the first file to know they didnt do any review themselves. I used my flywheel to check all their changes and without being able to read the code I saw indentation was all over the place, inconsistent bracket placements etc. I let them know I wouldnt check their code until it was according to their own standards.
Two days later I got the message to check it again. At first glance the indentation was fine so I started reading the code. Every single thing was hardcoded, not made to support mobile (or any resolution other than 1920×1080).
A week later they improved it and still not good. Gave them a few pointers like I would for any colleague and off they went to fix things. The code became worse and indentation was all over the place.

I told them the next time it shouldnt be a quick glance to be able to reject it again. By this time other teams came to me asking why it wasnt merged yet and I explained it to them. One of the teams couldnt do anything u til this was merged so I told them to implement it themselves. I was surprised that 4 teams came to me asking about a merge request, that was every team except the team whose pull request it was.

4 weeks after the intitial sprint the other team made a merge request and I had three small comments and then an hour later it was merged.

The other team messaged me why their merge request did went through (still havent seen any of their team in person, Im sitting 10 meters away from them behind a wall)
They also said that it was easier for them because they started from scratch. Thats when I called them in to discuss it all and if they were not interns but full time developers they would have been fired. I told them communication is key and that if you dont understand something you come in person to ask about it. They all knew I like teaching and have the patience to explain a single thing ten times, but the initiative should be theirs.

One of the team members is my current coworker and he learned his lesson by that. The others stopped with their study and started doing something completely else.

TL;DR
Merge request is open for 4 weeks, in the end another team started from scratch and finished it within a week. The original team didnt ask me questions or come to me in person, where other teams did.

DISCLAIMER: some of you might find it harsh, but in our experience it works the best for teaching and we know when people don't dare to ask questions and we help them in that too. It's all about the soft skills at our company.

I would react pretty much as this Guy did.

Code review, intern style:

Intern: Here is my pull request ...
Colleague: I see a problem with x, y, z. Could cause memory leaks.
Intern: Oh yeah you are correct, i'll fix that in the next one.
Intern: *merged*

Dear team leader, If you tell me „I need to review this merge request before merging”, then make sure you are able to allocate time to do this.

If you need MORE THAN A WEEK to even start, then maybe your delegation skills are nonexistent.

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

GIT COMMMIT LOG VERSION 011
-------------------------
4cc7d0d Derp, asset redirection in dev mode
6b6e213 Lock S-foils in attack position
1e44549 I am even stupider than I thought
2f6bec9 You should have trusted me.
891851a To those I leave behind, good luck!
3367d77 Update .gitignore
46d6b0f Merging the merge
b12f6fe First Blood
0598e4f 8==========D
9151ff4 Finished fondling.
3a0ec1e ...
8358c20 c&p fail
bc1e834 magic, have no clue but it works
31bb17a I don't get paid enough for this shit.
21edb91 :(:(
7a71610 Stephen rebase plx?
2060661 Copy-paste to fix previous copy-paste
21ac5d2 Handled a particular error.
2dedd90 pam anderson is going to love me.
c3d4c83 omg what have I done?
d38bafd Herping the derp derp (silly scoping error)
e461773 Merge pull request #67 from Lazersmoke/fix-andys-shit Fix andys shit
1faf82b Is there an award for this?
1f6e3f3 Feed. You. Stuff. No time.
6f0097d I'm too old for this shit!
133179e I'm just a grunt. Don't blame me for this awful PoS.
d3e5202 harharhar
57d9a7c THE MEM TEST FUNCTION YOU ARE LOOKING FOR, IS HERE. SAY THANKS FOR THIS COMMIT MESSAGE

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.

Trying to resolve merge conflicts and you cant remember which changes are the ones you want to keep. Lesson learned, make sure your pull requests dont sit waiting for weeks while master is happily being worked on.

Today I solved the problem assigned to me by changing one character. Simplest fix ever. Except that this problem is not on my project, and I don't have control over this project, so I can't merge my pull request or deploy the code, and the dev that does hasn't answered email today, and he's not scheduled out, and he's not in his office. Whatever, I'm just gonna say it's fuck it Friday and call it a week.

*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

Last week,my friend asked me to fork and pull request on his github repository so that he could review my changes and merge them,I had included some more exciting features in his app but till now he has not merged my request,instead he just copied the changes I made in his repo into his repo manually and updated his project,still he has not merged my pull request!!
That guy is a genius!

An amazing git story: A month ago coworkers did research and started with merge requests. Their workflow is as follows: A Feature is developed in a branch, then a merge request is opened. After a very short review it will be closed (rejected) and merged without request. (wtf!) After that the develop branch will be tested later, in case of bugs, a new branch per feature is opened.

Hi ppl of devRant! I’m not really a dev but I love reading your rants :) I decided to post my first rant because I think I could use some advice from you.

Background: I’m a student just finished my first year at uni. Earlier I applied for a developer intern just for fun and somehow magically got in. However, I'm a statistics major (not even CS!) and only know basic java stuff. I guess they hired me because I speak ok english and a little french? I live in a non-English speaking country but the company has a lot of foreign customers.

The problem is, the longer I stay, the more I feel that they only hired me out of charity *sobs* There isn’t much for me to do, and most of the time I couldn’t understand what my co-workers are doing so I can’t really help them either. Plus, they don’t seem to need my language skill as much, so I kinda feel useless here.

It’s my 5th (maybe already 6th?) week here and the only thing I did was fixing an itty bitty bug that literally needed only one additional line of code. Yes it took me a while to set up the environment, learn js from scratch since they use js for this project, and locate the issue but I’m pretty sure it’d probably take someone who’s familiar with the project, like, 3 mins? And now that I’ve fixed it and the merge request was passed, I’m out of work to do again. I talked to the lead and he pretty much just said “read more of the code”. Guess I can do that. I’ve spent like 4 days going through the code but is this really promising?

I want to spend time on learning actual stuff rather than yet another resume ornament. So what should I do? Should I ask for more help/more work to do, or keep learning on my own (I’m quite interested in algorithms, maybe I could make use of my time to study that?), or even leave?

Sorry for the long rant. I know ass-kicking devs probably hate useless, underqualified ppl at work in real life but believe me it really hurts to be one and I hate myself enough already so I’d appreciate any thoughts/advice :/

Randomly grabbed a open source project off github (zip didn’t use git. Didn’t wanna accidentally request a merge with my garbage code) after talking to the developer on discord about a feature I thought would be cool and he welcomed me to try adding it since he was busy bug fixing the latest release
Never seen the language before in my life (before I started college) and egotistically assumed I’d be able to learn enough to add what I wanted. I was horribly wrong. The farthest I got was potentially understanding how I’d be able to add it as well as getting a placeholder checkbox for the feature in the options form

Soon got discouraged and zipped up what I attempted and put it in my code graveyard on my archive hard drive for a future attempt

Don't need Netflix when you have a production deployment right before a long weekend. It has failed since last two weeks due to vulnerabilities present in one of libraries(P.S. FUCK JAVASCRIPT and Post release vulnerability scans!). You have rewritten the whole functionality from scratch twice! Security gates finally open for you, welcoming with arms wide open. So you click Deploy! DAFUQ!! FUCK MY LIFE! Deployment failed! It's only a 3 hour window to deploy! You frantically re-review your code, is it me?? Not again!! It isn't! Well, why is the deployment failing, you work against the clock. Going through configs, code, documentation! WTF is it?? Should I give up and raise a support ticket? Nope! You login to the server, sifting through logs and configs, there's a couple of other tickets with today's deadline. What are you going to do? And you get a hint! You take the hunch, change the config 5 minutes before deadline!
Get merge request approved, wait for the build, hit DEPLOY!! Nail biting 3 minutes! Your eyes fixed on the logs! Building..... Pushing instances..... Starting App..... SUCCESS!!! Finish the remaining tickets! Your long weekend still exists!

"I need a way to create PDFs from word documents"
"OK, here's Cute PDF, just print to it"
"Great, how does this work with my pdf letterhead?"
"Oh, well that's different, we'll need to create a word template with the letterhead pieces from the PDF. Here you go."
"OK, how do I merge the word documents generated by my fuckmess of a CRM software system?"
"You can copy and paste it, or we can purchase this software for you that should be able to do it"
"Why didn't you install that software first? You guys are useless"

Alright buddy, fuck you too. I'll be sure to automatically assume that even though your initial email is a full, complete request, that there's more behind it and read your mind through the email going forward.

I'm considering quitting a job I started a few weeks ago. I'll probably try to find other work first I suppose.

I'm UK based and this is the 6th programming/DevOps role I've had and I've never seen a team that is so utterly opposed to change. This is the largest company I've worked for in a full time capacity so someone please tell me if I'm going to see the same things at other companies of similar sizes (1000 employees). Or even tell me if I'm just being too opinionated and that I simply have different priorities than others I'm working with. The only upside so far is that at least 90% of the people I've been speaking to are very friendly and aren't outwardly toxic.

My first week, I explained during the daily stand up how I had been updating the readmes of a couple of code bases as I set them up locally, updated docker files to fix a few issues, made missing env files, and I didn't mention that I had also started a soon to be very long list of major problems in the code bases. 30 minutes later I get a call from the team lead saying he'd had complaints from another dev about the changes I'd spoke about making to their work. I was told to stash my changes for a few weeks at least and not to bother committing them.

Since then I've found out that even if I had wanted to, I wouldn't have been allowed to merge in my changes. Sprints are 2 weeks long, and are planned several sprints ahead. Trying to get any tickets planned in so far has been a brick wall, and it's clear management only cares about features.

Weirdly enough but not unsurprisingly I've heard loads of complaints about the slow turn around of the dev team to get out anything, be it bug fixes or features. It's weird because when I pointed out that there's currently no centralised logging or an error management platform like bugsnag, there was zero interest. I wrote a 4 page report on the benefits and how it would help the dev team to get away from fire fighting and these hidden issues they keep running into. But I was told that it would have to be planned for next year's work, as this year everything is already planned and there's no space in the budget for the roughly $20 a month a standard bugsnag plan would take.

The reason I even had time to write up such a report is because I get given work that takes 30 minutes and I'm seemingly expected to take several days to do it. I tried asking for more work at the start but I could tell the lead was busy and was frankly just annoyed that he was having to find me work within the narrow confines of what's planned for the sprint.

So I tried to keep busy with a load of code reviews and writing reports on road mapping out how we could improve various things. It's still not much to do though. And hey when I brought up actually implementing psr12 coding standards, there currently aren't any standards and the code bases even use a mix of spaces and tab indentation in the same file, I seemingly got a positive impression at the only senior developer meeting I've been to so far. However when I wrote up a confluence doc on setting up psr12 code sniffing in the various IDEs everyone uses, and mentioned it in a daily stand up, I once again got kickback and a talking to.

It's pretty clear that they'd like me to sit down, do my assigned work, and otherwise try to look busy. While continuing with their terrible practices.

After today I think I'll have to stop trying to do code reviews too as it's clear they don't actually want code to be reviewed. A junior dev who only started writing code last year had written probably the single worst pull request I've ever seen. However it's still a perfectly reasonable thing, they're junior and that's what code reviews are for. So I went through file by file and gently suggested a cleaner or safer way to achieve things, or in a couple of the worst cases I suggested that they bring up a refactor ticket to be made as the code base was trapping them in shocking practices. I'm talking html in strings being concatenated in a class. Database migrations that use hard coded IDs from production data. Database queries that again quote arbitrary production IDs. A mix of tabs and spaces in the same file. Indentation being way off. Etc, the list goes on.
Well of course I get massive kickback from that too, not just from the team lead who they complained to but the junior was incredibly rude and basically told me to shut up because this was how it was done in this code base. For the last 2 days it's been a bit of a back and forth of me at least trying to get the guy to fix the formatting issues, and my lead has messaged me multiple times asking if it can go through code review to QA yet. I don't know why they even bother with code reviews at this point.

Just merge this pull request in production and all service gonna work fine, trust me :D

I was wondering why my tutor needs a whole ass week to accept my MR.

Today he rejected one, so I got a chance to look at whatever he's doing.

He's checking line by line every single test I make and creates a variable for each dumb thing.

𝘦𝘹𝘱𝘦𝘤𝘵(𝘴𝘰𝘮𝘦𝘵𝘩𝘪𝘯𝘨.𝘪𝘥).𝘵𝘰𝘚𝘵𝘳𝘪𝘤𝘵𝘌𝘲𝘶𝘢𝘭(𝘴𝘰𝘮𝘦𝘖𝘵𝘩𝘦𝘳𝘛𝘩𝘪𝘯𝘨.𝘪𝘥)? No, this is bullshit.

𝘤𝘰𝘯𝘴𝘵 𝘴𝘰𝘮𝘦𝘵𝘩𝘪𝘯𝘨𝘐𝘋 = 𝘴𝘰𝘮𝘦𝘵𝘩𝘪𝘯𝘨.𝘪𝘥
𝘤𝘰𝘯𝘴𝘵 𝘴𝘰𝘮𝘦𝘖𝘵𝘩𝘦𝘳𝘛𝘩𝘪𝘯𝘨.𝘪𝘥 = 𝘴𝘰𝘮𝘦𝘖𝘵𝘩𝘦𝘳𝘛𝘩𝘪𝘯𝘨.𝘪𝘥
𝘦𝘹𝘱𝘦𝘤𝘵(𝘴𝘰𝘮𝘦𝘵𝘩𝘪𝘯𝘨𝘐𝘋).𝘵𝘰𝘚𝘵𝘳𝘪𝘤𝘵𝘌𝘲𝘶𝘢𝘭(𝘴𝘰𝘮𝘦𝘖𝘵𝘩𝘦𝘳𝘛𝘩𝘪𝘯𝘨𝘐𝘋)

I don't even know why you would take a week to accept a merge request when all you're doing is creating variables for things you use only once. I'm not even mad, I'm not ranting, I just need to know why would you do such a thing

Contributing on github projects.
Especially when my pull-requests finally merged to the original master ^^

Not 1 Business Unit in Company: We need this feature immediately.

My Team: Anyone object to this 2 hour old merge request?

Me: Well, yeah, I found a couple things that we should probably go ahead and address.

My Team: we'll fix that in a future release

Me: But you said that last release...

My Boss: MR Accepted

Also My Boss: Can you make a new user story to fix this?

When you assign someone you don't like to review your merge/pull request

My best code review was when my merge request was accepted in less than a minute after creation. It was simple but I expected more time on review and accept action.

My company is supposed to be 'remote friendly'

Any request to work from home is a fight to get approved, regular days frequently get cancelled for vital meetings and best of all our infrastructure is so shit the VPN drops silently every 5-10 mins. Good luck doing a big merge or getting latest code.

"Sorry, but nothing in this MR is as it should be (I don't even know where to start) - all you do here is waste scarce CI resources"

Much helpful. Such wow. Teach me how to make such toxic and useless merge request comments.

A wild merge request appears. These are your options:

A. Spend 3 days of back and forth
B. Accept MR and fix it yourself later

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!

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

I'm stuck with a (very) junior developer.
He doesn't understand requirements, why we are doing this and not that.
Today, I asked for a merge request to implement filters on research.
Maybe in one or two weeks ...

Don't forget, everything gonna be alright. 🤲 Or maybe, will I kill him before?

So i'm working with people from another team to bring about a feature. I was wondering, "how come they're churning out so much shit in so little time!?"

Apparently, they make code, merge request to the release branch, and then do unit tests later.

How do people, in good conscience, think that they can skip unit testing for extremely vital components???

So today I was having this discussion with my colleague regarding a messed up pull request.

Me: are you done merging the remaining branches into master?
Colleague: no, I'm still merging the changes manually.
Me: but why?
Colleague: because the changes will overwrite the changes in master.
Me: but how? It will just conflict and you can keep whichever changes YOU WANT. You can even edit before committing the merge.
Colleague: I'm just redoing the changes manually anyway.
Me: -_-

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?

I've been working as a developer for 10 years now... I got my first software development job when I was still learning for my masters.

After all this time I have switched programming languages and product types a few times from web development to mobile apps to desktop software (C++, CEF, QT,).

And I have come to the conclusion that I want early retirement... like right now retirement... I'm done dealing with management that doesn't understand shit... dealing with people we have outsourced part of the shit to... needing to fix stuff that is broken after some other person refactored the code and didn't fully test it and it somehow got approved... dealing with people that think that "know better" and implemented things like that 5 years ago because they thought like "THAT" and will not accept my merge request because of that.

Like don't get me wrong I love to make and develop software, but since this is the 3rd job in the row with a toxic environment like this I feel like I need to move to the country side and open up a farm or something :|

Love it when the maintainer of an open source project you contribute to runs a linter over the whole codebase and force pushes the changes to origin master so now all the Pull Requests in the queue have to be rewritten and have tons of merge conflicts to resolve. Awesome! 😠

My pull request has several merge conflicts but I don't cry. How strong am I?

4 months ago, my team had the task of redesigning the login page of our main app. Really nice design. Since it was fairly simple, it was given to one of our summer camp guys to do something useful. After he finished, it was stuck on merge request and no one bothered to check it, as it was not important for our PO's, it simply got forgotten...
Last week, since I was bored and remembered about it, I decided to check it and fix the small issues it had, without telling anything to our PO, just did it, asked for code review and added it to our latest release.

Today I overheard 2 guys from analytics team:
"Hey, have you seen our new login page?"
"There is a new WordPress developer so he just does his job well"

Our application is not in WordPress, only our company's website is!
Our application is in Angular!
There is no new WordPress developer! We only have an offer looking for one!

WTF

Yesterday, I was expecting my merge request to be closed.
I've done all the stuff my tech lead told me to do.

All tests passes, green light boyzzzzz.
Gitlab CI pipeline passes, greeeeeen light I said.

In Jenkins everything f*cked up...

Why ??

Well it was a conflict with 3 other MRs, missing rebase from other dudes.

And because they were remote working, got to clean up all this mess.

That's was a day off.

PS : well that's was not so off, I could fix a UB on a ternary and extend a test which was not covering some cases.

PS2 : learn git damn

When you keep on refreshing the tab to see if your pull request got merged but it still says
”Pull requests 1”

Picked up an issue to contribute to OSS for a community version of a major enterprise software. Did the changes, submitted a pull request. Someone reviewed it, asked for some changes, which i did and pushed the changes.

Then after some discussion with the guys working there, we thought of making some changes to the UI. Step in the company UI guy, he makes some changes, i merge his branch into mine and submit a new pull request.

Now, a new guy comes in to review the code, who has a problem with every change THEIR UI Guy did, and negates everything the first reviewer said, and asks me to do the changes, and boy was I pissed!!

But I did the changes, updated the PR, then the first reviewer comes in again, and suggests some more changes, most of them are for the code, THEIR UI Guydid!! Fucking psychopaths!! Never had i seen such paranoid people in my life!! Educate your fucking team first!!

I one again started with the changes but left mid way!! Now, even if i want to, will not update the PR!! FUCK YOU!!

Today, I'm making a revolutionary change to our code base. I'm finally deprecating a script that lived in this goddamn repo for way too long. There's about 10 copies of the same script in 10 different directories. The script copies all the code into a "dev" folder and then runs "sed s/prod/dev/g" on all the files, and then overwites a bunch of it with some files suffixed with ".dev". Finally, after fighting the so-called architects, the devs and everyone else that seems to have gotten used to the pain this cursed dumpster fire script has caused us, my merge request is now open and ready to go to get rid of this insanity. Now we won't have to deal with as many "surprises" that happen every goddamn time we deploy to production, overwriting all our hard work by accident, and relieve some of my OCD of having the same script in 10 different places in the repository.

One of the guys were tasked to implement a button with a functionality.
When I clicked the button, I got an error. Asked the guy why, and he said that fixing the functionality was not part of the task. What? So basically he just put a nice little button that does nothing? And our team lead just approved his merge request?!
I can't comprehend this logic at all.

Another story, I overheard a different guy debugging a pointer array (C++) with a senior. I couldn't keep my face straight when he seems to struggle to dereference a pointer and iterating through an array. He can't do that and he calls himself a mid-level engineer?!

The more I stay in this company, the more I realize that many people in my teams are clowns.

After three months of development, my first contribution to the client is going live on their servers in less than 12 hours. And let me say, I shall never again be doing that much programming in one go, because the last week and a half has been a nightmare... Where to begin...

So last Monday, my code passed to our testing servers, for QA to review and give its seal of approval. But the server was acting up and wouldn't let us do much, giving us tons of timeouts and other errors, so we reported it to the sysadmin and had to put off the testing.

Now that's all fine and dandy, but last Wednesday we had to prepare the release for 4 days of regression testing on our staging servers, which meant that by Wednesday night the code had to be greenlight by QA. Tuesday the sysadmin was unable to check the problem on our testing servers, so we had to wait to Wednesday.

Wednesday comes along, I'm patching a couple things I saw, and around lunch time we deploy to the testing servers. I launch our fancy new Postman tests which pass in local, and I get a bunch of errors. Partially my codes fault, partially the testing env manipulating server responses and systems failing.

Fifteen minutes before I leave work on the day we have to leave everything ready to pass to staging, I find another bug, which is not really something I can ignore. My typing skills go to work as I'm hammering line after line of code out, trying to get it finished so we can deploy and test when I get home. Done just in time to catch the bus home...

So I get home. Run the tests. Still a couple failures due to the bug I tried to resolve. We ask for an extension till the following morning, thus delaying our deployment to staging. Eight hours later, at 1AM, after working a full 8 hours before, I push my code and leave it ready for deployment the following morning. Finally, everything works and we can get our code up to staging. Tests had to be modified to accommodate the shitty testing environment, but I'm happy that we're finally done there.

Staging server shits itself for half a day, so we end up doing regression tests a full day late, without a change in date for our upload to production (yay...).

We get to staging, I run my tests, all green, all working, so happy. I keep on working on other stuff, and the day that we were slated to upload to production, my coworkers find that throughout the development (which included a huge migration), code was removed which should not have. Team panics. Everyone is reviewing my commits (over a hundred commits) trying to see what we're missing that is required (especially legal requirements). Upload to production is delayed one day because of this. Ended up being one class missing, and a couple lines of code, which is my bad (but seriously, not bad considering I'm a Junior who was handed this project as his first task at his first job).

I swear to God, from here on out, one feature per branch and merge request. Never again shall I let this happen. I don't even know why it was allowed to happen, it breaks our branch policies. But ohel... I will now personally oppose crap like this too...

Now if you'll excuse me... I'm going to be highly unproductive and rest, because I might start balding otherwise after these weeks...

Our Risk team is making us enforce having an approved change record before teams can merge to master.

As in, people will get in trouble if they complete a merge of a pull request outside of an approved change window.

This, of course, is completely separate from the change record they'll need before they deploy the code anywhere...

Important merge request howto:
- Hey, I implemented very important server change and it doesn't break compatibility with current clients!
- Cool, but we don't need this compatibility code. We'll adopt our clients as soon as the merge request is accepted.
- Ok, I removed support of current clients.
- Cool, but it's too dangerous to adopt our clients rights now. We'll accept your merge request later. Some other day... somewhere... some other time...

Third week in this job and it takes seniors 2 weeks to approve merge request that consists of 3 lines. So many pretentious discussions. Fuck all of you approve this shit so I could be happy with at least some progress.

* Left leave work a bit earlier, because I had driving lessons.
* Finished the issues I was working on and headed straight for to the school.
* Checks notifications
Coworker on that Merge Request I labled as ready: Did you forget to push?

I'm so sorry for being such a bad person 😅😭
At least it's nothing of priority 😔

Just joined a new company and can only describe the merge process as madness.....is it or am I the one that is mad?!

They have the following branches:

UAT#_Development branch
UAT#_Branch (this kicks of a build to a machine named UAT#)

Each developer has a branch with the # being a number 1 to 6 except 5 which has been reserved for UAT_Testing branch.

They are working on a massive monolith (73 projects), it has direct references to projects with no nuget packages. To build the solution requires building other solutions in a particular order, in short a total fucking mess.

Developer workflow:

Branch from master with a feature or hotfix branch

Make commits to said branch and test manually as there are no automated tests

Push the commits to their UAT#_Development branch, this branch isn't recreated each time and may have differences to all the other UAT#_Development branches.

Once happy create a pull request to merge from UAT#_Development to UAT#_Branch you can approve your own pull request, this kicks off a build and pushes it to a server that is named UAT#.

Developer reviews changes on the UAT# server.

QA team create a UAT/year/month/day branch. Then tell developers to merge their UAT#_branch branches in to the previously created branch, this has to be done in order and that is done through a flurry of emails.

Once all merges are in it then gets pushed to a UAT_Testing branch which kicks off a build, again not a single automated test, and is manually tested by the QA team. If happy they create a release branch named Release/year/month/day and push the changes into it.

A pull request from the release branch is then made to pre-live environment where upon merge a build is kicked off. If that passes testing then a pull request to live is created and the code goes out into production.

Ahhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh it's a total mess. I knew when I took on this job it would be a challenge but nothing has prepped me for the scale of the challenge!! My last place it was trunk based development, commit straight to master, build kicks off with automated testing and that just gets pushed through each of the environments, so easy, so simple!

They tell me this all came about because they previously used EntityFramework EDMX models for the database and it caused merge hell.

What the hell kind of tool is Gitlab? I just want to automatically backmerge hotfixes from master to development. Even fucking Bitbucket had a checkbox to enable this. But not Gitlab, no, you better create a pipeline job in your already unreadable, overcrowded pipeline yml, but oh, the checked out repo in the pipeline is a detached head and you cant push with the user that checks out there. So what, just use a project acess token which revokes after a year breaking your task and then switch origin amd branch manually. But your token-user can't push to protected branches, so create a merge request instead, which requires approvals, making the automated step no longer automated.
But dont worry, you can just use the gitlab api to overwrite the approval rules for this MR so it requires 0 approvals. But to do so you must allow everyone to be able to overwrite approval rules therefor compromising security.
And so you made a feature that should effectively be a checkbox a 40+ line CI job which compromises your repo security.

which nuthead of an architect is responsible for the way gitlab (and its CI) is designed?

You just have to fucking love it... Trying to get a pull request merged into our master, but because we *must* use fast-forward-only a single change on the master forces a rebase on my side, and an other complete build which takes some 15 minutes.

And of course the entire dev team is in goddamn overdrive and working their ass off, so here I'm sitting hoping to chance on a 'calm' 15 minute slot on the master without any other merges... Let's try attempt number 5 to merge this sucker.

first some background. I'm an intern coming in on the end of my internship (tomorrow's my last day). I've been working on a reasonably important project, more specifically a restful API. We have automation set up so that any commits to master on GitHub are pushed out into a live, accessible version. Some guy (let's call him dumbass) joined our team last week, and has had a few ideas

Dumbass: *opens pull request to my repo*
My boss: *requests changes*
Me: *requests different changes*
(All this before even testing his code, mind you)
Dumbass: *makes requested changes*
Me: *approves changes*

A day passes

My boss: *approves changes*
Me (not even 10 seconds after my boss approved changes): *requests more changes*
(Still haven't tested his code, I just ran A PEP8 compliance test)
Dumbass: *MERGES CHANGES TO MASTER*

Literally EVERYTHING breaks because he was importing a module that's not available

We don't notice until later that day (I'm still working on writing the tests for the automation, for now changes get put on live version even if everything breaks -- tool is still in beta, so everyone working on it (a whole 3 people) knows to TEST THEIR SHIT BEFORE MERGING TO MASTER.)

WHY EVEN BOTHER WITH THE PULL REQUEST IF YOU WERE GOING TO MERGE TO MASTER YOURSELF ANYWAY??!??!??

My frustration cannot be properly conveyed through text, but let's just say this guy's been there a week, I already didn't like him, and then he fucking does this.

Saw code in one of my files at a WIP merge request.
Wanted to add something to fix a bug.
Added, tested and committed.
Pushed.
Wondered why my change wasn't listed in the "changes" section of the merge request.

Turned out that I accidentally edited a file that had the same piece of code where I wanted to add something.
Well, lucky me! If I wouldn't have been editing the "wrong" file accidentally, i probably would have spent hours of debugging only to find out that I am actually in the real wrong file.

Things that annoy me about my current place:

1 - Only 3 people out of a team of 12 developers are allowed to purge akamai, or merge pull requests to master on any of our 200+ websites. Apparently this is because us contractors are not allowed because the permanent employees have to be accountable for the code.

Despite this, no-one actually reads the code. You just throw up a request in the slack channel and boom, instantly 30 seconds later someone approves it, even if its 500+ lines of code.

2 - I've pushed for us to move to agile instead of waterfall, and got declined (which is fine), but the reasoning was that the dev team are not 'mature enough' to work that way. Half the devs here have 5+ years of experience so I don't get the problem here.

3 - There is zero code reviewing process in place. I just watched as a developer's 300 line merge request was approved within 8 seconds of it going live. No-one is allowed to comment on the code review or suggest changes as this would 'slow down development'. Within that 300 line merge request were tons of css being aimlessly commented out, and invalid javascript (introducing both bugs and security issues) that were totally ignored.

What is your thoughts on these above points?

Am I too narrow minded or is the development manager clueless?

It really irritates me when other engineers of various levels get hung up on pedantic, low hanging fruit bullshit in my merge requests. Like really, why keep a thread going just to force me to explain why I chose to make a particular magic string a constant that you don't see a use for? What about all the infrastructure setup code I spent 3 days on? Did you even read any of that to make sure it was sound and that my dumb/drunk/tired ass didn't make an obvious mistake, or could have done it better?

I’m the only junior software engineer at a small startup where I do mostly web development, as well as other bits and pieces (automation, ci/cd, etc)

Our software team is extremely small so we do not have anyone dedicated to QA. I usually just ask a team members with related experience to review my merge requests. So if I have a merge request for our ci/cd, I ask the software engineer with the most ci/cd experience to review the MR.

Recently I realized that my MRs will usually sit for days, and sometimes weeks without the reviewers taking a look. And when they eventually do, they don’t even run the code. It seems like they just gloss over it and look for obvious syntax or logic errors.

It makes me feel as if my code and efforts do not have much value to our team.

It also pisses me off because whenever a issue happens in our codebase, me and my code is the first thing blamed even if my code is not the issue

Is this typical in other companies? Or is this something I should speak to my boss about?

Question about git. I worked on dev branch and made 10 commits.

Then I squash merged 10 commits from develop to master and made a release build.

Now problem is if I make a pull request from develop to master bitbucket will still show that master is behind (because develop has fixes in 10 commits while master has all of them squashed in 1 commit).

Now my question is whats the best way to make sure master and develop are synced (basically that master would have everything what develop has) ?

should I just merge master into develop back after the release?

New guy likes to both approve and merge other people's pull requests have he approves them. Please don't merge other people's pull/merge requests. Other team members may have comments too! The person who created it should merge it.

Do you use nesting in the scss / sass / less files of your project?

Nothing like code review and have to read the novel that is the comments on the merge request to understand what everyone's issue is with this one doc block. Wtf?

Finish the story and all tests pass
*notification another merge request been approved
Pull changes build, all tests faill

I've just received a merge request for a feature that we outsourced. How do you best deal with substandard quality?

It's a merge request for roughly 2k lines of code and I've already noted down 25 comments and I'm only at my first file :(

How to use git rebase when working with master and staging branch?

It might be a stupid question, but I really like the idea of creating a feature branch, work on it, if there are multiple commits squash them, rebase in top of master and then create a pull request from that branch to master.
It keeps the gut log pretty clean.

However, how would you do this, when not only working with a master branch but a staging/testing too?
Would you just rebase onto staging, merge to staging and when everything is fine, rebase onto master and merge again? Is there a netter way?

Have a question about git rebase with android studio.

So I have a feature branch which I finished working on, I made a pull request to develop branch and now I see many conflicts because develop is few commits ahead.

In android studio I switched to my feature branch, then did a git rebase develop and resolved all conflicts. After conflicted files were fixed I did a git add conflicted_file and continued with git rebase --continue until the end.

Now everything is finished. I have a local feature branch that was rebased to current develop, and I resolved all conflicts.

Problem is when I do a git push to my remote feature branch, I get a merge conflict error conflict from android studio and now I have to solve all merge conflicts yet again for some reason.

What I am doing wrong?

A young new dev was working on his first ticket, about a bug during parsing of an uploaded excel file. Our issue was that if the file contained an empty line, all remaining rows were ignored. So the task included extending our tests to cover this case. After 2 weeks (!), his merge request comes in. His idea (without ever asking for help) was to parse the whole file (in some cases huge) in the production code a second time, just to count the rows (!!) and save the count in a public static int field, which was verified in his new test.

So here's a question.
IF i have a developmentbranch that i'm working on an notice a merge conflict in my pull-request. I do a rebase on to origin/master. Then... I have to make pullforward or force push. Which one is more natural to do?

Completely noob question and before you say it, yes I have googled but I'm tired and I just get walls of text.

How do I merge a pull request?

A nice guy has submitted a pull request to my repository on GitHub, how can I merge it??

I tried what I thought was merging but it said that a file is conflicting. I tried deleting the file and it still didn't merge.