Long rant ahead, but it's worth it.

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

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

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

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

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

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

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

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

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

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

Gitkraken because it makes working with branches, submodules, merging, amending, rebasing, squashing, stashing etc. super easy and visual. Especially useful in huge projects.

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

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

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

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

Lead dev: Yes
*27 angry emoji reactions*

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

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

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

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

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

<no response>

*My team comes into the office*

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

Me: not.a.fucking.clue

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

Branch merging IRL

A couple of weeks back, I met some of the kids from my old school. They had joined together to form a small team and were designing and deploying websites for local businesses.

Turns out that they were mailing each other and using Dropbox to manage the source code. This had been going on nearly for an year.

I spent a couple of hours showing them how to use git and gitlab. Basics on committing, pushing, pulling, branching and merging.

I will never forget the look on their faces! They had seen God and its name is Git.

Looks like I'm getting fired on Wednesday :)

Long story:

*I add first unit tests to project.

*Boss adds new functionality and breaks all the tests so I can't compile and write more for what I'm working on.

*Boss is very fragile and cannot handle any comment that can possibly be taken as a slight against him.

Me: "I wanted to ask what our policy on unit tests is please? Because we haven't really said how we are treating unit tests, and everyone myself included is not thinking about them. I also haven't added tests when I fixed bugs and this time your changes broke the tests"

Boss 10 minutes later: "I want to speak to you in private".

Boss: "you are too forceful and direct. You said I should have added tests."

Me: "yeah but I didn't mean in a nasty way"

Boss getting louder and more aggressive: "You are too forceful"

Me: "I didn't mean it in a bad way"

Boss: "I didn't want to add tests for that!"

Me: "then why add any tests?"

Boss: "Fine we are not having this conversation now!"

*Boss storms out

I decided I can't speak to the guy about anything without upsetting him spoke to the manager before I quit because I can't work like this.

That resulted in a meeting with my boss, his boss and the head of HR where I ended up savaging him and told them I can't bring up anything as I can never tell if it will offend him and that I spend ages writing emails and trying to document communications because I just can never tell if I will upset him. Also that I cannot bring up any ideas because I can't tell if he will somehow get offended and that I can't even write code because if I change something he wrote at some point he will get angry.

My boss claims that I am extremely forceful and disrespectful and that I am constantly insulting him and his decisions.

We go back over a ton of shit and I refute everything he says. In the end I have to have a meeting with him on Wednesday where we either get things straight, he fires me or I quit.

I think at this point that our relationship is too fucked for him to be my team lead on a 6 man team.

Side note I keep bringing forth ideas because we have one database shared between 6 Devs, no pull requests (apart from mine and another new guy), no test driven development, no backlog, no team driven story pointing, no running tests before merging, no continuous integration setup, no integration tests, no build step on merge, no idea of if we are on track to our deadline other than his gut feeling, no actual unit tests backend - just integration with a test db, no enthusiasm to learn in the team and no hope.

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

So I have been merging loads of branches lately for our final release and now it’s affecting my dreams.

I sleep with two pillows, judge me I don’t care. One night I woke up screaming “Why won’t this merge?”

Everyone woke up and it took sometime for me to come to my senses. When my family switched on the light I saw one of my pillows partially shoved into my other pillow’s case.

I need a vacation.

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

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

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

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

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

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

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

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

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

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

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

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

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

Oh crap.

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

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

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

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

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

I found a cool project on GitHub. I forked it and added a simple dev server with the intent of making it more accessible which could lead to more activity = improved project. I created a PR with small concise commits with very informative messages.

The guy who owns the project comments and says "I don't want your dev server, I have an apache instance locally on my computer". I tell him "Ok sure, but wouldn't it be nice if everyone else also had a nice dev server which can be started with a single command?", and other people join the PR and agree with me that we should make it available for everyone.

But the fucking idiot doesn't care, "No, I prefer to use my apache server". YOU FUCKING ASS WIPE, why do you even put it up on GitHub if you don't want contributions to make your project better and more available? I saw other open PRs where he basically did the same thing, left a snarky comment without merging it. What a fucking tool. Worst spent time ever.

FUCK YOU

Adventures in security land.

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

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

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

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

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

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

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

TL;DR: I dont work in IT, but I code at work, and the non-IT higher-ups lack of knowledge shows brutally.

So I work in aviation, not IT. Through coincidences, I was tasked to work on our flight plan distribution logic years ago, which was then written in BRL (Business Rule Language). In lockdown 2020, I finally started to learn "real" programming with Python, but soon shifted to Java. Which was good, since all of a sudden a few months ago the company ditched BRL and the godawful IBM ODM IDE for... Java and IntelliJ. Nice. BUT my teammates have zero clue about Java and no real inclination to learn it by themselves. So I have been appointed their mentor, despite me stating Im still a beginner myself. Its somewhat doable, I get the hard problems, they do basic maintenace, basically renaming variables and stuff. One of my yearly goals is to make sure a completely new guy is able to do everything I do by september. It took a LOT to talk them out of it.

In my last yearly review I got some flak for not "selling" myself to other teams enough, whatever that means. So, as a learning project, I designed a new intranet page for our department in Javascript. Its loved by all. It has links to all the stuff we need woth a nice interface and built in tools to make work easier and more efficient. I did it on my own, in my spare time, simply because I was fed up with the old crap and it was an enormously good learning opportunity. Now they want to give some other guy the responsibility over that page/tool because apparently it is "not in my process team description". They even planned a day for me and him so he can "learn Javascript then". Suuure...

I also did a digital checklist tool as a webapp. All this runs from a local folder, no server at all because reasons. I made it work. Now they want it integrated into some other tool some other guy made. He wrote his tool in PHP entirely so merging the two will take considerable time. Which I told them multiple times. No, it does not take about two hours.

Sometimes, comrades, sometimes....
Im still grateful for the opportunity to code at work but the lack of knowledge really REALLY shows. My goal now is to talk management into paying for a Java course for me (they are very expensive here). That way, they get a better employee and I get more knowledge and an actual certificate thats worth something. Usually in this company, this has higher chances of success than straight up asking for more money.

Sorry for the long story, but it felt good just typing it all out, even if nobody reads this.

As we may all messed up a (git) repo at the begininng, do you know the surge of adrenalin right before pushing your committed changes or merging branches?

Don’t you love when you put a lot of blood, sweat, and tears into a company and then you get fired because your wife got a flat tire and you had to go help fix it?

When I got to this company they were not using version control, had no tooling in place, and most of our day was spent merging projects by hand and going through a long process to deploy our applications (this company is a primarily Salesforce company).

I got everyone using git and built a node client to transpile JavaScript and SASS, lint code, package everything together, and deploy it to Salesforce. Productivity jumped and the amount of time all of us spent merging code by hand dropped significantly.

A few weeks after finishing this CLI I was moved to another team and subsequently let go because I had to leave early to help my wife fix a flat tire. Now I am freelancing and actually doing pretty damn well for myself. Bonus: I no longer have to work with the disaster that is Salesforce!

Removing master/slave yet still merging it to master.

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

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

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

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

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

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

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

Merging my slaves into “main” just isn’t the same.
.
.
.
.
.
.
.
/s

*pulls down Android notifications*
*Scrolls through ≈ virtual 70 cm of devRant notifs*

Anyone else think devRant should have a setting to enable for merging all notifications into one notification card linking to notifs Activity that has running totals of ++s and comments?

Please, stop being afraid of git rebase.

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

Who says Windows is useless....

Running a python script to swap wifi networks, auto connect to VPN servers, run SSH commands and SFTP files to servers, downloading numerous files, sifting through outlook for emails, running excel macros for data cleansing, cell merging and formulas all at the click of a button 😱

Oh yea.. this is all 1 task that I never have to do again😂

Windows is useless for development you say? 🤔

Frontend dev for 10+ years here.

"We can't afford to hire you as a senior, so your job title will be 'Frontend Developer' and your tasks will carry less responsibility than expected from a senior"

One year in, team of 2 handling 3 projects.

After merging with the parent company, we got business cards, mine describe me as a "Senior Frontend UI Engineer".
"Well, our customers only trust seniors, otherwise we can't send you to them".

Meanwhile a former colleague earns >1000€ more a month.

Yeah, fuck you too bosses!

So, the company I’m working for is finally merging with its sister company. That means budget for upgrading our infrastructure. And guess who volunteered to be in charge of it, and future sysops. That’s me.

Previously we haven’t had anything close to a sysops, and our servers has been neglected and never updated nor upgraded since 2012. We even had a Windows Server 2012 running with rdp wide open...

Happiness is :

$ git pull
Auto-merging foo.bar
Merge made by the 'recursive' strategy.
$ _

A discussion about writing tests for frontend applications.

Context: my frontend coworkers don't write tests, at all. Yeah, really. Our testing process is very manual. We test manually when developing. We test manually when reviewing code. After merging, the application is deployed to a staging server and the design team does a QA Sprint. Lots of manual testing and some bugs still crawl by.

So I decided to start pushing my coworkers to start writing tests. One of the reasons I constantly hear them say to not write tests in the frontend is: "It's not worth the time, because design keeps changing, which means we have to take time to fix the tests. Time that we usually don't have."

I've been thinking about this a lot and it seems to me that this is more related to bad tests than to tests in general.

Tests should not break with design changes (small changes at least). They should test funcionality, not how things look. A form should not break if the submit button's style changes, so why should its tests fail? I also think that tests help save time, as they prevent some back and forth because of bugs.

Writing good tests is the hard part. Tests that cover what's really important and aren't frail and break with things that shouldn't break them. What (and how) should we test? And what shouldn't be tested?

Writing them fast is another hard thing. Are you doing it right if they take more time to write than the actual code?

What do you think about this? Do you write tests for your frontend applications? What do you test? How much time do you spend writing tests? What are your testing tools/frameworks?

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

1) HTML turing complete
2) Kardashian programming language
3) EU resolution that forbids accepting and merging pull requests without court order.

Because why not.

happy merging 🎢

you'd think by now people would understand version control. a whole days work gone because of bad merging.

So someone here had the job to merge the current version of our software into another older repo.
(That older repo has some features for future versions, that should be only in there ... don´t ask ... not my decision)

Took him long enough. But he forgot to check one thing while merging: The encoding of the files.

And we´re german...

ALL umlauts, and all other special chars in the code were replaced with this: �
No global replace, because all chars were replaced with the same char.
(Why the fuck do we have special chars in the code in the first place???)

So to not need him to start all over again I compiled a list of common german words containing umlauts and did a global search and replace.

I think I got 90% of the errors like that.
Now he´s going to correct the rest of the errors.

Fuck the comments in the code though.
Just a waste of time...

To all the people who don't know how to yield when merging on the highway...
To all the people who ride my ass when I am trying to pass a slower moving vehicles...
To all the people who try to pass on the right when I am trying to move back into the right lane so I don't break other peoples windshields with rocks by providing enough space...
To all the people who tailgate, then pass me almost causing a head-on, then 200ft later slow down and make me wait for you to turn...

FUCK YOU!

Recenty I have studied a lot about Bitcoin and Blockchain. The technology behind these things is amazing. And people are going mad over it. But, are we really going to the right direction? I have doubts.

Bitcoin was targeted to be a decentralized system. But in the present scenario, if BTC.com, AntPool and ViaBtc somehow merge, they will own more than 51% of the total computational power of the Bitcoin network. And if that happens, they will have full control over the whole network and will be able to replace the whole Bitcoin Blockchain with their forged entries if they want. By the way, btc.com is China based and owns 29.6% of the total computational power of the Bitcoin mining network. Forget about merging, if btc.com grows independently, who can assure that they would never cross the 51% threshold? Same problem exists with other Blockchain systems too. Are these systems really decentralized as they advertise? I really doubt now.

Happy Merging 😳

It's killing me.

This senior keeps doing all his fixes in the the same branch (named "develop-copy-{hisname}") and keeps merging it directly into develop and deployment branches. He has a lot of experience and therefore the manager gave him direct access to the branch.

The problem will arise when the QA team sends back one of the issues in the release back for changes. This never happened till date (his fixes are early and we vet all in-team changes, therefore he gets time to clean up his mess before the release date) but someday this will bite us in the ass.

I'm really unsure about ratting him out to the manager but I couldn't convince him to use separate branches (or separate commits) for different fixes. I couldn't convince him to add JIRA links/numbers into the commit messages either.

And, the junior devs I manage are getting inspired by him, and won't listen to me when I try to enforce separate branches, creating a political mess (probably I'm kinda like a contractor and they are permanent employees).

Sucks.

While merging colleagues code...
Because Android studio log cat sucks donkey balls 😂

Someone just overwrote 2 weeks of work in SVN because they don't understand merging.

When they did an update before committing they ignored the conflicts and tried to build their work.

But wait it won't build if their are conflicts, I know I'll just copy this backup over the checkout and check that in instead.

It took me over an hour tho fix this fucktard's mistake and I still don't think they understand what they did wrong. Their supposed to have 40+ years of experience.

In the end it turned out they wanted to change about 10 lines. They had checked in files that they didn't even change, they were just out of date compared to trunk.

tldr:
first year in college we programmed 24 hrs straight to fix somebody's mess before the deadline. Decided not to screw him over, instead he claimed to have done everything and we failed the assignment.

Long version:
var group= new[]{"Mike", "Gavin", "Gus", "I", "Ben" };
var client = "Jack"';

First year of college we had an assignment to make a web program for somebody.
Ben wanted to join our group and he already knew a client so we let him join.

After joining Ben wanted to be project lead, but we already decided Mike based on his experience.
Ben claimed to be much better in every way than Mike at and kept coming with stuff the following weeks why we should make him project lead. He kept pointing out when Mike did something wrong and he even came with an audio file where he clearly made jack say that he wanted Ben to be project lead .
After that we were all a bit pissed and told him that he should get it in his head that he was not going to be project lead and just start working on his part of the assignment.

We also found out that Ben was a documentation addict, what we could write in a small paragraph, he wrote a whole page about it. No joke, I rewrote a page of his in 5-6 rows with the same information in it.
No problem you thing, wrong! Because of this he kept bothering us arguing and claiming that our documentation was wrong because it was to short.

In the week of the deadline we asked Ben if he was also done, and told us that he was done for a while now.

The day before the deadline we came to school thinking we only had to do some merging and finishing up documentation.
Then we found out that Ben has almost nothing, and what he had the IDE was screaming that it was incorrect, spaces in Id's and css class names for instance. A really good programmer, my ass!
We were so pissed off at this point, but we had 24 hrs and needed to come up with a plan to fix it.

We decided that Mike and I were going to fix Ben his shit in the coming 24 hrs and Ben was going to make our last bit of documentation because we would not have the time for that, Especially if we had to argue with him like we had to do for each bit of documentation. Gus did not have time and Gavin could not program on his own yet, he wanted to help, but helping him help us would cost more time than we had.

We all went home after that and Mike and I started to program 24 hours straight while in a Skype call, making what Ben had 2 months for. Shortly before the deadline Mike looked at our finishing up documentation received from Ben and told me it was "Okay" and zipped everything up and uploaded it to school with a few minutes to spare.

After that we thought everything was good, we made Ben's part work and delivered it in time. We also decided not to throw Ben under the bus, because this would hurt all our grades because we did not work good as a group since we should have noticed it earlier.

A few weeks go by till the assessment.
The assessment start with asking if we want individual grades or as a group when you all think you did equal amount. We choose as a group, because if we chose individual not only Ben but also Gavin would get a lower grade and we did not think that was fair because he tried so hard.

We demo the product and the teachers are positive. When the teachers start about the documentation, the first thing they tell is that they found something interesting in the documentation, and they read it to us:

"I, Ben, have made all the documentation because my group did not want to."

That was so far from the truth, we all did make our documentation about the parts we made. Yes he did do overall a little bit more because every single bit of documentation we had to argue with him, so every time he volunteers to make it, we would all agree. And he made Mike's and i's last bit of documentation.

Telling the teachers on that point would not have mattered, it would only have hurt is in another way, so we did not and all failed the assignment. And we all felt like to strangle him.
This is now a few years back, but i still want too.

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

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

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

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

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

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.

Wk78

My worst dev experience was my first software as freelance...
1 month codding
When delivering the app the client didnt want it anymore...
Two years latter the client calls me because he had a problem... Merging hundreds of access 97 databases... Exactly what my software did (besides editing, filters and remove duplicates)
Told him I got mad, deleted the source code and was already working on a company...
He had to pay for a software company to do the same 10 times the cost

A server application pulled off some sort of listings as table. Problem was, it crashed with some thousand data files after one and a half hours. I looked into that, and couldn't stop WTFing.

A stupid server side script fetched the data in XML (WTF!) and then inserted shit node-wise (WTF!!), which was O(n^2) - in PHP and on XML! Then it converted the whole shebang into HTML for browser display although users would finally copy/paste the result into Excel anyway.

The original developer even had written a note on the application page that pulling the data "could take long". Yeah because it's so fucking STUPID that Clippy is an Einstein in comparison, that's why!

So I pulled the raw data via batch file without XML wrapping and wrote a little C program for merging the dumped stuff client-side in O(n), spitting out a final CSV for Excel import.

Instead of fucking the server for 1.5 hours and then crashing, shit is done after 7 seconds, out of which the actual data processing takes 40 bloody milliseconds!

So we were supposed to have another good build today.

Supposed to.

This one guy on our team gets weird sometimes, and refuses to commit his shit until the last minute. He says "Don't worry, I'll handle all the merging, it'll be fine!"

What he forgets is that much of our code relies on his! His latest commits reworked a couple entry points and a class definition. No backwards compatibility.

He made his commit, and nearly our whole stack shit the bed. Jesus jumping Christ. Weekend? Nope.

Today is a great day ! Deadline is tomorrow, fixed all the issues, looks like everything works...

...

CONFLICT (content): Merge conflict in xyz
CONFLICT (content): Merge conflict in abc
CONFLICT.....
...
Automatic merging failed; fix conflicts and then commit the result.

I hate my life :)

Git on Visual Studio is so dumb

I wanted to do a Pull Request, and when I checked the request, a conflict prevented from auto-merging and ask to resolve it in Visual Studio.

"What conflitct ?" I asked.

"You're on your own, fam" Visual Studio answered.

Real sweet.

I no longer work for a startup company. On Monday I’ll start work for a real company, one that values project managers and their infrastructure. As a DevOps engineer, I value the IT resources that power my old companies SaaS platform. My old position is not being back filled and they’re hiring a full time dev instead of and Ops engineer. They have chosen to proceed with zero employees who know Azure or the platform their own software runs on.

Word to the wise when choosing to work for a startup. Ask these questions:

- Do they have a dedicated product manager/owner , who isn’t also the CFO?

- Do they value infrastructure and their IT resources ?

- Do they have decent powered laptops to work with?

- Do they have too much technical debt because they’re always building new features ?

- Do they work 18 hour days because they set poor work/life boundaries ?

- Who handles Support tickets , and what’s a typical support issue like?

- Do they have a branching and merging strategy? Don’t accept “we’re too small” as an answer! It’s a trap that they don’t want one.

99 problems but a conflict ain't one

Conflicts, conflicts everywhere.

A bug is born
... and it's sneaky and slimy. Mr. Senior-been-doing-it-for-ears commits some half-assed shitty code, blames failed tests on availability of CI licenses. I decided to check what's causing this shit nevertheless, turns out he forgot to flag parts of the code consistently using his new compiler defines, and some parts would get compiled while others needed wouldn't .. Not a big deal, we all make mistakes, but he rushes to Teams chat directing a message to me (after some earlier non-sensible argument about merits of cherry picking vs re-base):
Now all tests pass, except ones that need CI license. The PR is done, you can use your preferred way to take my changes.

So after I spot those missing checks causing the tests to fail, as well as another bug in yet another test case, and yet another disastrous memory related bug, which weren't detected by the tests of course .. I ponder my options .. especially based on our history .. if I say anything he will get offended, or at best the PR will get delayed while he is in denial arguing back even longer and dependent tasks will get delayed and the rest of the team will be forced to watch this show in agony, he also just created a bottleneck putting so many things at stake in one PR ..

I am in a pickle here .. should I just put review comments and risk opening a can of worms, or should I just mention the very obvious bugs, or even should I do nothing .. I end up reaching for the PM and explained the situation. In complete denial, he still believes it's a license problem and goes on ranting about how another project suffering the same fate .. bla bla bla chipset ... bla bla bla project .. bla bla bla back in whatever team .. then only when I started telling him:
These issues are even spotted by "Bob" earlier, since for some reason you just dismissed whatever I just said ..
("Bob" is another more sane senior developer in the team, and speaks the same language as the PM)
Only now I get his attention! He then starts going through the issues with me (for some reason he thinks he is technical enough to get them) .. He now to some extent believes the first few obvious bugs .. now the more disastrous bug he is having really hard time wrapping his head around it .. Then the desperate I became, I suggest let's just get this PR merged for the sake of the other tasks after may be fixing the obvious issues and meanwhile we create another task to fix the bug later .. here he chips in:
You know what, that memory bug seems like a corner case, if it won't cause issues down the road after merging let's see if we need even to open an internal fix or defect for it later. Only customers can report bugs.

I am in awe how low the bar can get, I try again and suggest let's at least leave a comment for the next poor soul running into that bug so they won't be banging their heads in the wall 2hrs straight trying to figure out why store X isn't there unless you call something last or never call it or shit like that (the sneaky slimy nature of that memory bug) .. He even dismissed that and rather went on saying (almost literally again): It is just that Mr. Senior had to rush things and communication can be problematic sometimes .. (bla bla bla) back in "Sunken Ship Co." days, we had a team from open source community .. then he makes a very weird statement:
Stuff like what Richard Stallman writes in Linux kernel code reviews can offend people ..

Feeling too grossed and having weird taste in my mouth I only get in a bad hangover day, all sorts of swear words and profanity running in my head like a wild hungry squirrel on hot asphalt chasing a leaky chestnut transport ... I tell him whatever floats your boat but I just feel really sorry for whoever might have to deal with this bug in the future ..

I just witnessed the team giving birth to a sneaky slimy bug .. heard it screaming and saw it kicking .. and I might live enough to see it a grown up having a feast with other bug buddies in this stinky swamp of Uruk-hai piss and Orcs feces.

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.

When you're wondering where all your work went and realize the IDE stashed it because you forgot to commit before merging/changing branches.

I was pulling my hair wondering why the DataFrame was not merging. Took my 1 hour and a half to figure it out.

My first project is finished xd. i was in designing but merging it with coding was a great idea. It has got a serial system amd an auto updater. Yep it is a cheat injector xD rate for a guy who just started coding.

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

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

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

Good luck I guess.

Today our Jenkins admin told me that I broke the build by merging a branch with too many commits.

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.

So there is a 50/50 chance I am getting flamed af tomorrow during code review because of my branching/merging actions on thursday and friday... Merge conflicts... We all love them...

I've created a code review for merging someone else's code, coz they were signed off sick for the last month.

They're making comments about how it's wrong.

It's code they wrote, but restructured to be more readable.

They wrote incorrect code that was just so illegible they didn't realise.

How do I explain this diplomatically?

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.

just woke up in the middle of the night dreaming of merging some branches after working a 16 hour shift straight because my company is too fucking broke to hire another freakin' dev...

well fuck it who needs sleep at all! let's get some coffee...

I'm the lead dev on this team. The project is split into multiple separate modules to comply with separation of concerns, and so new devs don't need the whole fucking codebase (risking them running away with everything) to contribute to the project as a whole.

So we don't need a fucking config file to enable and disable features.

So we don't need to upload a 500mb monolith every time we want to test a change.

So we can test old fucking versions of modules without merging it back into the entire codebase.

What did this fucking dev do? He was having one small issue with Maven. One. It wasn't updating his local snapshots to the correct Artifactory version.

He decided, instead of trying to fucking fix it: HEY, LETS IGNORE THE LEAD DEV'S DEMAND TO KEEP THEM SEPARATE. IM GOING TO MERGE THEM INTO ONE MODULE FOR SOME FUCKING REASON.

I refuse to continue working with this dev if he's going to sidestep my demands and undermine my authority. He wants to go it alone? Be my fucking guest. I'm not touching his shitty single-codebase monolithic monstrosity.

If this is going to be a regular fucking occurrence, he can eat a dick and choke on it.

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

Copy-pasting 90% of our entities including logic and merging some - creating thousands of duplicated lines - and then creating views for those abnomalies just to speed up the ORM fetching which could have been done with a single join...

Took me some time to delete all of that fking shitty untested code full of bugs...

!dev

Childhood trauma has lasting effects and it's our own responsibility to identify them and break our barriers.

I have 2 projects, both of them are stuck because 1. Dependant on other team and I am not able to fix the setup of their service even after seeking help from them; 2. My setup of Android Studio started throwing error out of no where when I am low on time for merging the code to mainline, we need to perform QA and without my build working we might not be able to test a use case.

I have scrum tomorrow, I feel scared to tell this to my stakeholders just because I think they will think it's my problem. Something wring with me. As a child my father blamed me for the mistakes I didn't have any control over, again and again. Whenever I feel awkward in any situation I think that he must have said that how big of a dumb I am. How I don't have any brains to do anything. Those things still come to me. That's why I am scared, people will BLAME me for this. But I have worked on my capacity to solve this. That's it.
That's all that matters. I have seeked help already, now I need to discuss this with the management and not feel scared.

First time ever merging two massive networks.
If this doesn't give me pain, technically my thesis work is done. Prettification, optimization, and the actual writing is left, but the main part is done.

And when this is done, I shall feel epic.

The pain of merging the conflicts of code on which you never worked on ... ahhh omfg ..

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

1. Change Windows to be one of Linux Distros. Merging the two worlds into one.

2. Every open source contributer gets magically paid based on their contribution. Your welcome Wikipedia.

3. Genie Dev, I set you free.

When you come up with a perfect working model for branching and merging, and everyone agrees apart from the one guy who insists you use gitflow because he likes shiny new things

So I finished 6-month long frontend studies and the school proposed internship in one of the best local coding companies. I got their test, basically to write 'API-based internet app with any of JS frameworks'.

Me: 'Hooray!!!'. Couple of days later, app delivered. Made with jQuery (because this is the only js framework the fucking coding school taught me). Very long, very personal cover letter sent along with it.

They: ' We are sorry, but we will not consider anything written with jQuery'.

Me: 'OK'. Learning ReactJS alone by myself for two weeks, 8-10 hours daily. Another two weeks - another project delivered. News agregator, fetching from 3 APIs and merging news based on publication time. News categories, news search - all the bells and whistles. Made 100% myself - not some clone from Udemy workshop or youtube.

They: 'Sorry, your project isn't good enough'.

Me (silently): Fuck you too, stupid HR manager. If you aren't able to see the motivation and dedication in a person, shove a dildo up your ass.

When some one else checks in code by merging a class you wrote, but now they've broken the build .. And some how it's now my problem 😳

Dear X. There's an obvious error with the way you're merging arrays; instead of conditionally adding items to the existing array, each condition overrides any items added by the previous conditions, which is clearly not the desired behaviour. I'd love to add a test to illustrate this behaviour, but you're not using them. I'd also love to create a simple pull request, but for some fucking reason you're using the worst possible version control system so I can't do that. I've submitted a support ticket along with all the code needed to fix this silly mistake, but apparently you either don't understand 2 lines of your own fucking code, or you didn't even bother looking at it before posting a shitty generic reply about "needing more information". There is no such thing as more information. There are two IFs, and they are supposed to add items to the array, not override any previous items. It's written in your own comments, and it's pretty obvious from the way the rest of the function merges those items.

Also, use a fucking linter, your code is a mess.

incompetent fucks giving no shit about agreed git flow

merging directly to master
complaining about conflicts and not willing to solve it themselves

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

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

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

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

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

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

In a previous job, I was trying to organize a common repository with our shitty business partner so we could both be able to contribute our part so our work would not overlap. Not like they cared anyways.

One thing I quickly noticed is those fuckers would just straight up commit untested changes on master and cripples our whole testing and prod deployment at times because we were depending on a shitty IoT service they provided us onto which we had no control whatsoever.

I told my boss, who was often complaining about them being unreliable in the first place, I would simply restrict them from merging and commiting to develop or to master without my approval. We cannot keep working like this.

He told me that we could not impose on them our work practices and that I should not try to piss them off. To be diplomatic.

I politely and professionally refused to do it, but he did change his mind in the end. He and I left not too long after. I guess he felt obliged to respond that having his job at stake but you cannot condone voluntarily shitty work.

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 :/

Merging...

When I have to ask the same person in the team for the hundredth time why they didn't run the unit tests before pushing 😞

Then eventually get them to setup system that prevents merging with broken tests themselves, but they do it in such a way that still lets them get away with pushing broken tests 😡

What to do when for a single issue, multiple contributors send out different PRs doing the same stuff?
I feel bad to close a PR without merging when they have spent there time in it.
I never expected that my repo will ever attain such dilemma for PRs.

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

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

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

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

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

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

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

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

Inclusivity anyone?

Time spend with coding: 2 hours
Time spend with branching, merging, fixing merge mistakes and check if systemnis building again: 4 hours

What a miserable day...

git rebase > git merge

I'm honestly tired of colleagues completely fucking up the git history along with creating conflicts for no reason at all.
How do you even manage to "recommit" changes when merging?

I can't even squash properly because there are 5 merge commits on the feature branch. Fuck off

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!

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

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

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

Fuck bro im mad!!!!

I am here late on a freaking Friday night before a holiday weekend doing some stupid conversion for a company. They have to have it done before Monday ( the holiday) as they plan to go live then.

Did I mention that they asked for this 2 days ago? I had to write the entire system to upload their batch of accounts into our system and return to them the corresponding new accounts. In 2 STUPID DAYS! Not to mention nobody was here to code review it today, so I had to run over it with one of the it guys before merging it myself.

Good thing I didn’t have a conference tonight that I paid money to go to. Oh wait, I do. Luckily it only started 2 hours ago so I might just make the final keynote, if I am lucky.

So the guy I replaced as the senior dev on my project (because he was lazy) is now trying to give me advice on how to cleanup my code.... This is the motherfucker who blatantly copies and pastes from one library to another and pushes the code without doing ANY testing and so I had to spend many weekends cleaning up his pile of shit code, and now I have 3 new tickets labelled 'style updates' that he wants me to merge in.... Fuck him, I'm not merging his code

Some senior developers add in useless review comments just to pause merging.

When it happens, its tough.

"Have conflicts on your PR? Just solve them by merging target branch into your branch and problem is solved"

The project started as a series of individual prototypes. The client the wanted a beta app for a few selected clients, and someone had the great idea of just merging the prototypes into a single app. The attitude of the devs was always "whatever, this will be rebuilt for public release"

Over one year later, and after many different developers touched the project, the client wants it to go live, there was never a rebuild, and there won't be one until a few months after it goes live, and the project is buggier than it ever was.

A rebuild would have been quicker and safer than fixing the huge backlog of bugs, still the client won't accept a rebuild.

A few people already quit over this project and I think I will be the next one to hand in my resignation.

for my job I need to know,

Programming, C#, Optimization, Multithreading and Async code, Working certain tools, Reading difficult written code, Understanding, Physics, Networking, Rendering, Codeloops, Memory management, Profiling tools, Being able to make Jira tickets and read Jira tickets. Understanding source control branching, merging, push and pull. bug fixing.

And I write almost 1 line of code a week on average..

I'm a programmer.

TL:DR: Unclear requirements led to a complete code rework

Background: We (2 friends, both already work as developers beside studying, and myself) are in a course about multi core programming for Java. We got an simple assignment which we were about to finish today.

An other friend of us is also in this course and asked if he could use some special method which is far above the taught material. He got a email with the following answer: "You are free to use any features of java 8 apart from lambdas and concurrents as we use them for our next assignment." He told us as he couldn't believe that we weren't allowed to use lambdas an we sat in front of our codebase and the only thing we could think of was "fuck".

Our entire code base was filled with lambda expressions as the requirement paper didn't mention any restrictions apart from using java 8.

FUCKING FUCKTARDS GET YOUR REQUIREMENTS RIGHT AND SAY WHAT YOU DON'T WANT TO SEE.

And here I am, sitting in front of intellij and merging my lambda filled fixing branch with our now lambda free working branch.

> merging feature 20155
> Removing debug messages for previous commit
> Fixing bug from feature merge
> Fixing bug from previous fix
> Merge fml

Merging one git branch into another when it conflicts an added line or function.

Like really? You can't handle ONE LINE being added?

Just curious on whether or not to open source something or not...

As some would have seen I'm working on a game engine/framework and putting a lot of effort into the development terminal (lumber camp) and had a fair few people show interest in it so thought I might chuck it on GitHub as I go but I don't want to allow for merging until the main component is at version 1 and stable...

Should I release as I go and not do merging or wait till it is at version 1?

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: -_-

My coworker pushed changes to almost all of our ASP.NET pages. However, he did so by pushing only his files, and when asked to merge, he overwrote all of our changes to those pages since he last pulled from the server, which was ages ago. We were three changesets past that overwrite before we noticed things we'd already fixed were gone. Had to revert, which we didn't know how to do, and we didn't know what he changed in his push, because he didn't comment on the changeset. He undid weeks of work, thankfully we only lost a few days worth over we reverted. We're going to have a quick lesson on merging correctly on Monday when we all get back

MRW I spend hours merging/deleting needlessly scattered configuration options and logic, and the application runs successfully

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

After merging 2 branches, Git randomly decided not to merge one particular line (the place where my newly defined function was called) and that caused a fixed bug to reappear. First time in 4 years I am witnessing Git do something strange like this— probably an issue in the “merge by ort strategy”.

"(Getting) otwelld"

The state of a fallen laravel developer, after he makes a PR to the laravel or lumen documentation and the epic troll otwell closes it within a minute, with the epic meme "already there", although the documentation is absolute dogshit at places and actually merging those PRs would make sense, so not every single developer out there has to make the same mistake or debugging

Do y'all prefer rebase or merging workflows? I still don't understand the difference.

TL;DR: idiot 'team leader' does mindless merge to master. Precious time wasted in a high pressure deadline environment.

So, i work currently at one of Belgiums largest consulting company's at brussels airport, we are moving their analytics platform to the cloud.

We use puppet to manage the systems.

When i started i noticed immediately that their 'development workflow' is hardly to be named as such, because they simply change stuff directly on server , manual 'temporary' fixes everywhere, hardcoded stuff, non validated code... Basically the way one would develop in their garage, not in a consulting company as this one. But that is just the beginning.

A month ago i did a major effort to equalize all the discrepancies between the codebase and the server. Ensured entire codebase to be validated, syntax checked, parsed, tested... It works. A 'great codebase overhaul' commit was PR'ed to master and got merged.

Yesterday the team lead, i'll call him 'B-tard' from here on, has also 'equalized the discrepancies between codebase, server and the restnof the stale branches on the repo' . i was doing my other work on my branch so no fucks given. This is where i should have given some fucks.

Anyways, today. The day starts every day with merging the master branch into your working branh because you need the latest working codebase, right?

Wrong!
This fucking dipshit smug b-tard has done a mindless merge of the entire codebase, effectively removing ALL validated working code for provisioning servers. Control blocks, lookup functions, lambda's... Basically everything he did not understand.

At the same time the project is already way beyond the allotted budget in pkney and time, so there is a huge pressure to have a working 'production' environment TODAY!

THIS MOTHERFUCKING B-TARD JUST MADE THAT IMPOSSIBLE.

i'm loving this assignment, i'm loving the PM, the collegues, the environment, the location... everything. All but this fuckibg b-tard that somehow got his position by sucking dick or licking ass or both...

I wanna get out asap.

Oh... While typing this and arriving at the room of the office... It is locked, i have no key.

Fucking asshole!

Where I work, we've just started using flavorDimensions. This is gonna save us a lot of time on keeping projects with many common code in one repo. Hope it's worth the trouble of merging everything together 😃

If I get asked why I didn't complete a task tomorrow I will respond politely with "because we outsource all of our projects, I am fixing shitty bugs resulting from abismal code on 6 different project, merging requests, project managing even though I'm a developer, liaising with clients, writing scopes of works, estimating new projects whilst being the lead dev on 4 projects. Sorry you're right, like everyone else you need this today. I'll get right on that"

Team had to solve a ticket from QA...we had no idea how long it would take so we estimated 6 man-days to fix it (being optimistic). After 2 days we had found the issue which had already been solved on another branch... time well spent and thank you for merging!!! Fuck you!

Facebook keeps popping up with news about merging Instagram into Facebook to create F.B.I

I'm like WHAT THE F***!

Ahh, I realize people arent going to give a shit about this either.

They can slowly bake it in a *slow boiling a frog style* and eventually it will be merged.

Delete Facebook.
Delete Instagram.
Delete Whatsapp.

Read Devrant!

So many years ago while I was in college learning to code and interning as a developer working on a javascript based image designer. We were learning event handlers in class and I was learning how to work with jQuery.

So I decided to build an event handlers to move objects by key press. I had an afternoon free and dont remember merging it to the codebase.

A few months later, something was pushed that took key press the event handler and the testers complained about losing the event handler I made.

End of the story, I added a feature that is still being used because I wanted to learn how to do something.

How do you implement TDD in reality?

Say you have a system that is TDD ready, not too sure what that means exactly but you can go write and run any unit tests.

And for example, you need to generate a report that uses 2 database tables so:

1. Read/Query
2. Processor logic
3. Output to file

So 1 and 3 are fairly straightforward, they don't change much, just mock the inputs.

But what about #2. There's going to be a lot of functions doing calculations, grouping/merging the data. And from my experience the code gets refactored a lot. Changing requirements, optimization (first round is somewhat just make it work) so entire functions and classes maybe deleted. Even the input data may change. So with TDD wouldn't you end up writing a lot of throwaway code?

A lot of times I don't know exactly what I want or need other than I need a class that can do something like this... but then I might end up throwing the whole thing out and writing a new one one I get a clearer idea of what i or the user wants or needs.

Last week I was building a new REST API, the parameters and usage changed like 3 times. And even now the code is in feasibility/POC testing just to figure out what needs to be used. Do I need more, less parameters, what should they be. I've moved and rewritten a lot of code because "oh this way won't work, need to try this way instead"

All I start with is my boss telling me I need an API that lets users to ... (Very general requirements).

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.

I mean where do I even begin
I am trying to fix up some really awful sloppy mistakes but since we only use svn and I don't have any sort of branch of my own I end up breaking other peoples builds while I try to fix their mistakes
And then I get yelled at and told to test the build somehow on their environment which is totally seperate to ours, and ensure there are no build problems
Even if said problems are svn conflicts they are apparently still my fault and evidence as failure on my part as a developer
I mean how do i even retort to that? Can I tell them to get stuffed, like seriously.. I have asked and checked in if there was any issues and they said nothing repeatedly
I have proposed the idea of a integration environment to test the commits of revisions and merging ect.
I got told off

For gods sakes

Atm we're merging everything straight up to production because we only have our first client going live tomorrow. No problem except for the fact boss is using production to give demos to clients already. And so some JavaScript change that broke search made it to production and cropped up during a demo. So what does boss do? Call HR/support and yell at her that everything which works needs to keep working. Which is fair if we were live and we go back to merging to production being rare. So HR/support was in tears during our meeting where we were taking about the new live branch structure. GG boss. We consoled HR/support but really boss man knew how we work but ignored it.

Question for everyone though: what can we use or do to prevent changes to more general JavaScript breaking things around the code? We talked about unit tests and maybe code linters but is there more? Because it seems now might be the time to improve our working and even get budgets for tools.

GitHub, your Copilot sucks, and so does Dependabot!

Dependabot opened 3 pull requests;
merging the first one caused conflicts in package.json and package-lock.json that must be resolved;
while trying to investigate further, the second pull request got closed as it suddenly seemed obsolete.
Dependabot: "Looks like these dependencies are no longer updatable, so this is no longer needed."

This kind of service generates so much noise and irrelevant alerts, it comes out of nowhere and there is no way to get rid of those bots once they invaded a repository. And they are so useless. A simple `npm outdated && npm upgrade` would have done better in 99% of the cases.

GitHub, your Copilot sucks, and so does Dependabot!

#Suphle Rant 3: Road to PHP8, Flow travails

Some primer: Flows is a feature that causes the framework to bypass handling the request now but read it from cache. This cache entry is meant to be populated without warming, based on the preceding request. It's sort of like prefetching but done on the back end

While building Suphle, I made some notes on some chapters about caveats and gotchas I may forget while documenting. One such note was that when users make the Flow request, the framework will attempt to determine who user is, using authentication mechanism defined on the first module (of the modular monolith)

Now, I got to this point during documentation and started wondering whether it's impossible for the originating request to have used a different authentication mechanism, which would result in an empty entry for returning user. I *think* it's possible cuz I've got something else called "route mirroring", where web based routes can be converted to API routes. They'll then return JSON, get served under defined API path, use JWT, all automatically. But I just couldn't connect the dots for the life of me, regarding how any of this could impact authentication on the Flow request

While trying to figure out how to write the test for this or whether it was even necessary (since I had no use case), it struck me that since Flow requests are not triggered by an actual user, any code attempting to read authenticated user will see nothing!

I HATE it when I realize there's ambiguity or an oversight, after the amount of attention and suffering devoted. This, along with a chain of personal troubles set off despondency for a couple of days. No appetite for food or talk. Grudgingly refactored in this update over some days. Wrote some tests, not all passed. More pain. May have to convert them to unit tests

For clarity, my expectation is, I built this. Nothing should be impossible for me

Surprisingly, I caught a somewhat lucky break –an ex colleague referred me to the 1st gig I'm getting in 1+ year. It's about writing a plugin for some obscure forum software. I'm not too excited cuz it's poorly documented and I'll have to do a lot of groping, they use arrays instead of objects etc. There's no guarantee I'll find how to implement all client's requirements

While brooding last night, surfing the PHP subreddit, stumbled on a post about using Rector to downgrade a codebase. I've always been interested in the reverse but didn't have any incentive to fret over it. Randomly googled and saw a post promising a codebase can be upgraded with 3 commands in 5 minutes to PHP 8. Piqued my interest around 12:something AM. Stayed up all night upgrading it, replacing PHPSTAN with Psalm, initializing the guy's project, merging Flow auth with master etc. I think it may have taken 5 minutes without the challenge of getting local dev environment to PHP 8

My mood is much lighter than it was, although the battle is not won yet –image tests are failing. For some weird reason, PHP8 can't read generated test images. Hope I can ride on that newfound lease on life to study the forum and get the features working

I have some other rant but this is already a lot to digest in one sitting. See you in rant #4

Automate merging workflow for Github

Much better merging today! The interns are figuring it out, one headache at a time!

error: Merging is not possible because you have unmerged files.

What the fuck git?

And everyone complains about winsows and its "press F12 to continue"

I'm pretty much at my dream job currently. A lot of autonomy as a developer, solo projects, as there are only two developers in-house and each of us is covering roughly half of the systems, we rarely work on the same thing at the same time. We do have weekly sync checkins to keep each other appraised and offer a helping hand/eye when needed.

But.

There's always a but.

Our IT department used to service 500 to 1000 employees 7 years ago, and now, through growth, opening new sibling companies, and merging with our competitors we're at 6k, give or take.

Maybe it's the aftermerge crunch to harmonize our IT systems but I've been working 10+ hours from August. It's an interesting couple of new pieces of software that I'm writing but, the deadlines are pretty tight and business requirements are anything but tight still.

I love my job, but I wish to get the bigger stuff done soon so I can take it easy.

The analytics guy just sent me updated tracking specs for a web site.

There are two sheets in the file: "Custom Events LATEST" and "Custom Events updated". This is already confusing enough.
One of them has comments like "I'd like this to be amended", but the event specs described are the same as the ones implemented.

I asked him for clarification, turns out he wants the ones marked in black to be updated, the ones that don't have any label saying they don't need to be updated.

This is also a guy who for at least 2 years has been making columns in spreadsheets wider not by just widening them, or merging multiple cells, but by just letting text overflow into other cells.

I do wonder how some people manage to keep a job.

I submitted my first pull request 2 days ago and guess what maintainer closed the issue without accepting and merging my request even 1 day ago I have commented on the issue comment box that I have a pull request please accept.

Not feeling good, I was thinking the hardest task is to find an issue we can contribute to, but the hardest task is, which we can't have control in and that is merging the pull request.

GitHub defaults to only allow squash merging feature branches, and suggests that it is "safe" to delete the feature branch that contains all the detailed commit messages at the place where they belong. Losing history, plus creating unnecessary "conflicts" after continuing to work and adding fixes to the same feature branches later.

Coworker just showed me how he avoids merge conflicts and I'm undecided on it. We use feature-branch workflow, so if a feature takes a long time to finish, it may mean merging master multiple times. He avoids it by stashing changes instead of committing them, then when he needs to merge master into the branch it's still clean. When the feature is done and he's ready to commit, he pops the changes and git diff shows all the changes before you push and you just change what you need instead of being forced to use the horrible merge software.

There must be problems with this, right? This seems too easy for it not to be the standard.

I got 21 files with conflicts while merging feature to develop.
16 files were just identation and space shit conflicts. WHY do you commit reformats that change tab characters with spaces or vice versa without changing any code??? STOP WASTING MY TIME

In an already verbose, strongly types Java codebase and you see

private String m_strDisplayName;
private boolean m_bIsResolved;
...

I can understand the itch of another teams decided to rename it with correct Java convention. All nice and good, except that these changes were not merged back to master.

Five years, few re-orgs and product restructuring later, I'm staring at 500+ files merging mess trying to bring back these product codebase together.

I work in a team that's predominately ASP.NET MVC when it comes to web development. We're merging with another government agency 's development and they're using Node.js.

So I figure that I should make an effort and learn Node.js as I've only had minimal exposure to it.

After five minutes discover that corporate proxy prevents access to npm. Oh well, never mind!

Looking back on it, I don't understand why I used merge commit strategy as go-to to merge git branches the first +-3 years of my career. It sucks

Guess I was just afraid of rebase after I accidentally erased history the first time I used it and failed.

For a small team (<= 7 people) working on a self-managed Gitlab instance ('Starter' subscription), is it better if each user keeps a fork of the project they work on (working on other branch than master) or have everybody work on the same fork (still, different branches)?

Also, squash commits on branch merging, yes/no and why?

I just joined a team using nuget shared packages for a lot of stuff. The Nuget packages get version incremented on merge - but this approach means that if several people are working cross stack and need to change their project and the Nuget package, everyone is going to have to wait their turn to do a merge and ensure their version is correct when merging (or it won't build).

What are the ways around this and still use nuget packages? I can't stand the though of working on totally different functionality to someone else and have to deal with this shit.

I want to merge select and delete/drop query together and make it as one in MySQL. For ex:

Select * from t where year = 2015 and drop table tab;

or

Select * from t where year = 2015 and delete from tab;

and ya you can't use ';' for merging

I was merging using Visual Studio Code when I realised I wanted to merge neither the current nor the incoming code. I wanted it both gone. And that option does not exist!
Only accept one, the other, or both.
T'was a mildy interesting experience.

When you go after a 2 day leave and take an update and spend half of your day merging YOUR module properly. I wonder why its MY module anymore. :-/

Pushed the code without compiling. We weren't generating builds before merging the code back then. It was so embarrassing

Git starts merging changes to your private personal repository is scarier than seeing someone else in the mirror in the empty room

How does Git collaboration on a web text editor/web IDE works behind the scenes (like that of GitLab)? Do they shallow copy the git repo per user working on it and apply any operation (like branching, merging, rebasing) over that or how does that works?

The new team member seems to hate me... For releases, each component that needs to be released has an owner responsible for building and post release merging.

I already own 2 branches but she assigned me 2 more...

Merging datas using spark sql with two conditions.
my code:
1.merge with first condition
2.merge with second condition
3. 1.unionall(2)
This gives some extra datas(total=10000 and result=10220)
$better way?any way?

Commenting and forgetting to delete before merging to master, only to create another branch just to delete these comments or put TODOs. 😑😑

Jira is powerful tool, especially when we combine it with Bitbucket. But, have you ever worked in a company where for example creating feature branch or merging PR changed jira ticket status? Personally I have never seen such automation, even if all clients I have worked for always complained about dev not changing statuses in jira.

How do you protect your team's git remotes?
We tend to protect the master and stage branch from force pushing and only allow merging pull requests after successfull recent tests and successfull review by someone with proper permissions. Depending on the project the Dev branch is only protected from force pushing though. All other branches are free to handle however wanted.

We recently had someone do a "git push -f --mirror" without understanding the command. Quick reminder what that does: it mirrors all your local branches to the remote so that the remote will be a mirror of your local repo. Branches that exist on remote but not on your machine will be removed from the remote.
A then needed to work from B's feature branch but of course that was gone... So while the idiot didn't fuck up our protected branches he still fucked over other people's workflow with that.

Is there an alternative to outright blocking force pushes which could have prevented that (except force pushing intelligence into his brain)?

Does any one know how to install ffmpeg for php on server
On window or Linux server? I want to use ffmpeg for merging the sound on server.

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.

Merging two months of work from one SVN branch to another without touching the trunk. I now know what the 16th level of hell is.