A group of wolves is called a pack.

A group of crows is called a murder.

A group of developers is called a merge conflict.

It's a merge conflict

When a traffic light has a merge conflict.

You remember when I said the people near me might take everything away?

THE DAY HAS COME.

FUUUUUUUUUUU-

Do I have to say how retarded it is to take a PC and a phone away from a person who first off, loves tech, second of all, gets all her university assignments and information THROUGH an email, third, wants to be a game developer?

Seems like even telling them that I am trying to get as much informed about gaming industry as a whole isn't a valid fucking reason for why I use tech as often as I do... I want to be a game dev, you fucking morons.

So... This began by them AGAIN drilling me about the university progress. I cannot even remember my goddamn schedule, for fuck's sake! How do you expect me to remember every damn grade, every damn exam date and every damn subject name? They also expect me to study 100% of the time I'm using the PC. WHO does that?

They start drilling. I try not answering. It drives them mad. They start exploding. I try all I can to calm the goddamn situation. It's not enough for them. NO, they HAVE TO KNOW EVERYTHING! I try all I can to survive the situation without a conflict. Too late. At a certain point my amazingly clever father says I'm definitely autistic for trying to answer in as little words as I can. Because they totally don't give me a reason to never want to talk at all in their presence...

They got mad enough to take the phone, the PC and my headphones away.

And now here I am, writing this on a university PC in Chrome of all :|

Merge conflict in git

You know what?

Young cocky React devs can suck my old fuckin LAMP and Objective-C balls.

Got a new freelance job and got brought in to triage a React Native iOS/Android app. Lead dev's first comment to me is: "Bro, have you ever used React Native".

To which I had to reply to save my honor publicly, "No, but I have like 8 years with Objective-C and 3 years with Swift, and 3 years with Node, so I maybe I'll still be able help. Sometimes it just helps to have a fresh set of eyes."

"Well, nobody but me can work on this code."

And that, as it turned out was almost true.

After going back and forth with our PM and this dev I finally get his code base.

"Just run "npm install" he says".

Like no fuckin shit junior... lets see if that will actually work.

Node 14... nope whole project dies.

Node 12 LTS... nope whole project dies.

Install all of react native globally because fuck it, try again... still dies.

Node 10 LTS... project installs but still won't run or build complaining about some conflict with React Native libraries and Cocoa pods.

Go back to my PM... "Um, this project won't work on any version of Node newer than about 5 years old... and even if it did it still won't build, and even if it would build it still runs like shit. And even if we fix all of that Apple might still tell us to fuck off because it's React Native.

Spend like a week in npm and node hell just trying to fucking hand install enough dependencies to unfuck this turds project.

All the while the original dev is still trying TO FIX HIS OWN FUCKING CODE while also being a cocky ass the entire time. Now, I can appreciate a cocky dev... I was horrendously cocky in my younger days and have only gotten marginally better with age. But if you're gonna be cocky, you also have to be good at it. And this guy was not.

Lo, we're not done. OG Dev comes down with "Corona Virus"... I put this in quotes because the dude ends up drawing out his "virus" for over 4 months before finally putting us in touch with "another dev team he sometimes uses".

Next, me and my PM get on a MS Teams call with this Indian house. No problems there, I've worked with the Indians before... but... these are guys are not good. They're talking about how they've already built the iOS build... but then I ask them what they did to sort out the ReactNative/Cocoa Pods conflict and they have no idea what I'm talking about.

Why?

Well, one of these suckers sends a link to some repo and I find out why. When he sends the link it exposes his email...

This Indian dude's emails was our-devs-name@gmail.com...

We'd been played.

Company sued the shit out of the OG dev and the Indian company he was selling off his work to.

I rewrote the app in Swift.

So, lets review... the React dev fucked up his own project so bad even he couldn't fix it... had to get a team of Indians to help who also couldn't fix it... was still a dickhead to me when I couldn't fix it... and in the end it was all so broken we had to just do a rewrite.

None of you get npm. None of you get React. None of you get that doing the web the way Mark Zucherberg does it just makes you a choad locked into that ecosystem. None of you can fix your own damn projects when one of the 6,000 dependency developers pushes breaking changes. None of you ever even bother with "npm audit fix" because if security was a concern you'd be using a server side language for fucking server side programming like a grown up.

So, next time a senior dev with 20 years exp. gets brought in to help triage a project that you yourself fucked up... Remember that the new thing you know and think makes you cool? It's not new and it's not cool. It's just JavaScript on the server so you script kiddies never have to learn anything but JavaScript... which makes you inarguably worse programmers.

And, MF, I was literally writing javascript while you were sucking your mommas titties so just chill... this shit ain't new and I've got a dozen of my own Node daemons running right now... difference is?

Mine are still working.

When you have a merge conflict

My mom died when I was 7, after which my dad bought me a Commodore 64 so I had something to lose myself in during the mourning process.

I learned everything about that system, from my first GOTO statement to sprite buffers, to soldering my own EPROM cartridges. My dad didn't deal with the loss so well, and became a missing person 5 years later when I was 12.

I got into foster care with a bunch of strict religious cultists who wouldn't allow electronics in the house.

So I ran away at 14, sub-rented a closet in a student apartment using my orphan benefits and bought a secondhand IBM computer. I spent about 16 hours a day learning about BSD and Linux, C, C++, Fortran, ADA, Haskell, Livescript and even more awful things like Visual Basic, ASP, Windows NT, and Active Directory.

I faked my ID (back then it was just a laminated sheet of paper), and got a job at 15-pretending-to-be-17 at one of the first ISPs in my country. I wrote the firmware and admin panel for their router, full of shitty CGI-bin ASP code and vulnerabilities.

That somehow got me into a job at Microsoft, building the MS Office language pack for my country, and as an official "conflict resolver" for their shitty version control system. Yes, they had fulltime people employed just to resolve VCS conflicts.

After that I worked at Arianespace (X-ray NDT, visualizing/tagging dicom scans, image recognition of faulty propellant tank welds), and after that I switched to biotech, first phytogenetics, then immunology, then pharmacokynetics.

In between I have grown & synthesized and sold large quantities of recreational drugs, taken care of some big felines, got a pilot license, taught IT at an elementary school, renovated a house, and procreated.

A lot of it was to prove myself to the world -- prove that a nearly-broke-orphan-high-school-dropout could succeed at life.

But hey, now I work for a "startup", so I guess I failed after all.

This is how one of our junior devs solved a merge conflict

Git add .
Git commit -m 'stuff'
Git push
Error: merge conflict in 594 files

Git commit suicide

- History teacher: The Spanish-Moro conflict lasted 400 years.
- Student: Why didn't they try a different merge tool?

Who killed MySQL?

"Can you give an example of a work-based conflict you were involved in, and how you went about resolving it?"

"Heh, ohhhh yes. Last job actually. Manager flipped out at me for the billionth time for no reason at all. I calmly handed my notice in, changed a bunch of encryption keys and disabled a bunch of users on the server before leaving and never looking back."

"Wow. Seriously?!"

"Absolutely. I'm very forward-looking."

Still no idea if the guy just decided to turn up to the interview to waste our time, or he really was stupid enough to think that was a positive.

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

That co-worker that erases all of your changes if there's a merge conflict.
Fuck you too buddy.

Me after a large Git merge, after expecting masses of merge conflicts and getting none. Life is good my friend.

During yesterday's Demo.

PM: It's a bug.
Client: It's a feature.

Reality: It's merge conflict.

:/

A group of wolves is called a pack.

A group of crows is called a murder.

A group of developers is called a merge conflict. :|

Git Pull Failed, Merge Conflict.

Me:
don't do it
don't do it
don't do it
don't do it
don't do it
don't do it
don't do it

Me:
Delete local project folder and pull the project down again.

Jack and Jill
Pulled down from git
To fetch aPaleOfWater.c
Jack made some changes
And then pushed them all up
A merge conflict occurred
Jill decided his changes sucked
And push --force over his
Jack was enraged
For history was changed
And force pushed Jill
down a hill

"Have you ever been in a conflict?"

Yes and it usually is resolved by deleting files then recloning

What happens when two developers get married?
They merge

Me: So how do you handle conflict
Candidate: I use git kraken to highlight my conflicts and walk through them one by one

Probably the most developer answer i've ever heard hahaha

Successfully resolved my first merge conflict WITHOUT destroying the whole project.
#eleventh-time-lucky

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

I think I'm done guys

Dear devRant,
I am writing to you today to ask you for a favor.
Please support landscape mode, viewing landscape images in portrait mode really upsets my right brain hemisphere. There is a conflict with what my synapses think but this is another story.

Regards,
#th

VSCode, just let me kiss you!

This is so fucking good :( :(. Fixing conflict has never been so easier.

Took only 10-20 mins to resolve merge conflict

git commit at 5.50 pm
The winner doesn't have to worry about merge conflicts

I "Git Pushed" my friend to "git commit" with a girl he likes for long time

But now my other friend wants to "git rebase" on top of her ....WTF

Now need to resolve this merge conflict 😂😂😂

So my ethernet randomly stopped working on Arch.

At first I thought it had to do with a conflict between it and my tethered phone, so I tried removing all my connections. Still wasn't working.

Next I tried to test the driver itself and make sure it loaded on boot. It loaded, but was disconnected.

Next I decided "fuck it, I know I was just using the internet on Windows, but I'll check the ethernet cable is still plugged in anyway". It was, and it was returning the right MAC address, but still no connection.

So I try debugging the driver further. Everything seemed fine, except it would time out trying to establish a dhcp connection.

Finally I figured, maybe Microsoft tried to troll me and lock out the ethernet waking on boot. So I restart my computer, load into windows and check my ethernet driver, it seems fine. I go to disable the shutdown of the card on OS shutdown. Turns out this driver no longer has that capability.

Wait a minute!? Windows is also having connection issues!?

I look to my left.

Fuck my life...

My router was off... I must of kicked the powerboard under my desk..........

A group of programmers is called a merge conflict.

What your file looks like when it has merge conflicts:

"Before you marry someone, you should first give them a massive merge conflict to see who they really are."

!!privacy
!!political

I had a discussion with a coworker earlier.

I owed him for lunch the other day, and he suggested I pay him back either with cash (which I didn't have), Venmo, or just by him lunch the next time (which I ended up doing).

I asked about Venmo, and he said it was like paypal, but always free. that sounded a bit off -- because how are they in business if it's always free? -- so I looked it up, and paid special attention to their privacy policy.

The short of it: they make money by selling your information. That's worth far more than charging users a small fee when sending $5 every few weeks. Sort of what I expected when I heard "always free," but what surprised me is just how much they collect. (In retrospect, I really shouldn't have been surprised at all...)

Here's an incomplete list:
* full name, physical address, email, DoB, SSN (or other government IDs, depending on country)
* Complete contact list (phone numbers, names, photos)
* Browser/device fingerprint
* (optional) Your entire Facebook feed and history
* (optional) all of your Facebook friends' contact info
* Your Twitter feed
* Your FourSquare activity
(The above four ostensibly for "fraud prevention")
* GPS data
* Usage info about the actual service
* Other users' usage info (e.g. mentioning you)
* Financial info (the only thing not shared with third parties)

Like, scary?

And, of course, they share all of this with their parent company, PayPal. (The privacy policy does not specify what PayPal does with it, nor does it provide any links that might describe it, e.g. PayPal's "info-shared-by-third-parties" privacy policy)

So I won't be using Venmo. ever.

I mentioned all of this to my coworker, and he just doesn't understand. at all. He even asks "So what are they going do with that, send me ads? like they already do?"

I told him why I think it's scary. Everything from them freely selling all of your info, to someone being able to look through your entire online life's history, to being able to masquerade around as you, to even reproducing your voice (e.g. voice clips collected by google assistant), to grouping people by political affiliations.

He didn't have much to say about any of them, and actually thought the voice thing was really cool. (All I could think of was would happen if the "news" had that ability....) All of his other responses were "that doesn't bother me at all" and/or "using all of these services is so convenient."

but what really got me was his reaction to the last one.

I said, "If you're part of the NRA, for example, you'd be grouped with Republicans. If they sell all of this information, which they do, and they don't really care who buys it or what they do with it... someone could look through the data and very very easily target those political groups."

His response? "I don't have to worry about that. I'm a Democrat, and have always voted Democrat. I'll tell anyone that."

Like.
That's basically saying every non-democrat is someone you should be wary of and keep an eye on. That's saying Democrats are the norm and everyone else is deviant and/or wrong.

and I couldn't say anything after this because... no matter what I said, it would start a political conflict, and would likely end with me being fired (since the owner is also a democrat, and they're very buddy-buddy). "What if they target democrats?" -> "They already do!" or "What if democrats use it against others?" -> "They deserve it for being violent and racist, but we never would" (except, you know, that IRS/tea-party incident for example...)

But like, this is coming from someone who firmly believes conservatives are responsible for all of the violence and looting and rioting and mass shootings in the country. ... even when every single instance has been by committed by democrats. every. single. one.

Just...
jfl;askjfasflkj.

He doesn't understand the need for privacy, and his world view is just... he actually thinks everyone with different beliefs is wrong and dangerous.

I don't even know how to deal with people like this. and with how prevalent this mindset is... coupled with the aforementioned privacy concerns... it's honestly *terrifying.*

introducing my classmates to git and how it can help us.

*explaining scm, git, github and bitbucket, and conflict resolving*

"why don't we just use google drive ?"

#Merge Conflict

It goes like this.
I have one final task to solve before starting in a new job at a different company. This guy, which is also a board member in the company in which I'm currently hired, is also an IT consultant and project manager in a fairly large company. This said person is also a key person for me being able to solve this last issue. I send him a complete guide on what he has to do before I can move on and wrap it all up.
First conflict arises because he doesn't follow the guide and tells me something is not working. I kindly inform him why and the response I get is very personal and not kind in any way, telling me and my boss that I am bad at my job and that he will bill us for 1000 USD for the 5 hours he used "debugging" and testing. This should have taken him 30 minutes and I have no idea what he spent those 5 hours doing.
It comes down to that my boss sides with this asshole and tells me that I have to do the task all over and test the system for the 4th time (yes I tested it 3 times beforehand to make sure nothing could go wrong) What my boss and the asshole doesn't know is that my uncle is vice president in the firm the asshole is working for. After kindly reminding this asshat that he has to follow the guide and that I can confirm everything is working, he keeps on attacking me. It's very rare that I fuck up and I have consulted 2 colleagues and got them to test it as well. They found no issues at all. The asshole ignored my request of documentation that something was not working.
I'm so full of being treated as an idiot so I send my uncle the email correspondence with the asshole to confirm that this is not how any of their employees should behave independant of my ability to do my job.
He will speak with this fucker tomorrow at work as first thing in the morning. I'm not proud of the way I went about this, but that was like the last drop, if you know what I mean.
Sorry for the long rant.

!dev
> Get on Deutsche Bahn train
> Train delayed
> Miss Eurostar connection (not just me, many people did too), get the next one
> Building works in Brussels Station
> Maps inaccurate
> Get lost
> Find Eurostar terminal
> Electricity failure
> Check-in suspended
> After 40min, announcement
> This train cancelled, get the next one
> Electricity fixed
> Check in, finally
> Now 2½ trains worth of people need to get on this one
> Somehow fit on train
> Lose table because family needs it (fair, but annoying)
> Train departs
> More delays due to scheduling conflict
> Arrive in Lille Europe
> Stop for 10 minutes for no reason
> Announcement: "there is an illegal passenger on board, everyone and their luggage needs to get off"
> Get off train, stand on platform for a decade
> "Who has left an orange bag on coach 18?"
> Nobody
> They bring the bag out
> It's red, not orange
> "Oh it's mine, sorry" - some woman
> Wait around for ages
> "Everybody go downstairs and go through security again"
> Go through security and passport control
> Get back on train
> Arrive at St. Pancreas
> Last train to where I live has gone
> Woohoo, I get to pay for an expensive hotel in London
> Get rail replacement bus service home
> Home 😒

What do you guys think of my setup?

Okay, just because I'm the only one under 35, single, and only white/hispanic guy on this team doesn't give you the right to interrupt me mid sentence IN my meeting. No disrespect to the developers from India and this may just be a culture conflict where I am outnumbered in my company but I don't understand the how some of these guys can't just be polite or respect others opinions(this is just from my experience with 90 or so developers from India and I don't believe in blanketing all Indians as this way just these 90 plus I do love the food).

Don't hijack MY meeting and then completely derail where I was going and disregard my solution without listening to the whole thing for an idea that isn't even solution but adds more work for both parties involved. You may have been working here for 5 years, but I worked in the actual department where we're building the new process and solution to a problem I've worked on. I understand the user since I WAS ONCE THAT USER for a good 8 months. And on top of that you can barely code efficient, or complex SQL statements. You're nothing more than fucking script kiddies and this whole IT department is joke. I apologize if the rant isn't really that coherent, I'm not very good at typing rants with my adrenaline running hot.

Every damn time

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Teach them advanced google searches.

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

Teach them how to ask a good stackoverflow question :>

You know shared folder in Windows? My boss tell us web developers to work on an app inside that single shared folder (from one "powerful" pc, lol) to prevent conflict and keep the app up-to-date instead of git.

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

Merge conflict

git-rebase-no-conflict

When you haven't pulled from master in a week or two and then you do and there's no conflict with the big set of changes you're working on

I got a new laptop today, it only had internet explorer so I used it and it's actually not that bad at downloading other browsers (ಠ ͜ʖಠ)

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.

I could go on for days about this. I am gonna go with the captain. COME AT ME!!

Sometimes the worst part about being a dev is:

I was in my way back from work when this guy speeds off the on-ramp onto the highway and almost hits me.

I suppose you could say that it was a pretty serious merge conflict...

When there is a conflict, a jedi uses the force!

git push -f 😂

Sharing this, since I made this during paid working hours.

There is no conflict.

New job was killing me. remote team has an 8 hour time difference to us, and no understanding of it. Constant last minute invites to meetings at 10pm my time. Made worse by the fact that many were unnecessary, duplicates or just plain pointless. So for the last few weeks of last year I made in my mission to clean it up.

New plan: move my hours around on Mondays, stay later, move all the meetings back to back and get everything out of the way for the rest of the week.

First day back and heres how the new plan is shaping out:

- 5:30pm meeting organiser decided we actually need 2 almost identical meetings instead. Sends out a big team meeting for the same time as my 1st meeting at 5pm, as well as the existing one for 5:30pm. Already agreed on by everyone else, so had to go.
- Cancelled my original 5pm meeting for today, said we'll re-arrange it for earlier going forward (not enough time for notice for remote team).
- Went into my new 5pm meeting, turns out we don't need 2. Got everything done by 5:30pm.
- Just to be safe though, a new invite will be sent around for the hour of 5 - 6 "Just in case".
- My 6pm meeting just got cancelled as she has a conflict (despite setting it up 2 months ago)
- Now I have to wait around, after hours for my 6:30 meeting.

..... believe it or not, this is progress.

Happy new year!

I never had problems with punctuation marks during coding, especially the notorious semicolons because I've always used an IDE, ain't gotta time to waste on compiler errors.

But today I meet my nemesis, a fucking comma wasted an hour of my precious time, causing my unit tests to fail in Python, my unit tests where expecting a list and the actual value is a tuple, it turned out that there was this trailing comma - which I don't know where the hell it came from - at the end of a function call that returns a list.

I only noticed this freaking comma after Pycharm indicated a conflict between the returned type and the expected type and underlined the culprit, that small invisible fucker 😬.

Thank you Pycharm and type hints in Python 3.

this is why, my fellow devs, you have to use an IDE.

PS: For those of you who aren't familiar with python, a trailing comma at end of a variable turns it into a one element tuple.

1, = (1,)

So a few days ago I shared about the conflict with my colleague on learning React. Today I was let go. Obviously I asked why they would do that and they said they feel the problem isn't even my React knowledge but the fact I don't grasp the fundamentals of OO programming.

Thing is in these 3 months there has not been a single code review. They are either going of what my lying colleague told them (they claimed he was excluded from giving feedback), or the consultants who were hired to help us. And yes, I got feedback I should improve but at the same time the assurance so long as I show improvement it'd be fine. And I was told they could see improvement. So I'm not sure what changed but suddenly there is no budget to keep me on. In any case it feels like shitty corporate bullshit.

But I can't say they are wrong. I struggle to explain simple concepts I know in words. I've worked a series of bad jobs where nobody cared how you did stuff as long as it got done. I feel I'm so behind now and so affected by bad knowledge it's even harder to fix than to learn the first time. So I'm wondering how to fix this.

I'm really gutted too because I loved this company. I was finally getting a fair wage instead of being underpaid. The people were excellent. I felt I could finally relax and feel safe at work. And now I feel betrayed. Which for someone with self esteem issues is very hard. Can't trust in myself and can't trust in others.

I'm gonna try and pick myself up in the morning, but today I feel totally shit. This wasn't how I'd expected things to go. I thought my manager had intended to talk conflicts over but instead I get the boot. And the advice to stop overselling myself. Real useful that. Like it is on me that they hired me despite my subpar interview because my CV looked good. It's a shitty excuse. In any case they're now stuck with a dev that walks out of work, throws false accusations about colleagues, and another person warned me about to not engage because nothing good ever came from it. He's gonna keep over engineering everything and make up for all the time he wastes outside of work creating a dysfunctional environment for everyone. But yeah, easier to fire the new person who does her best despite the odds. And who cautioned against over engineering because we kept missing deadlines. And who believes in refactoring when it is needed because that's how agile works. Yeah better keep someone who has no sense of work life balance and makes others miserable then claiming he's being driven out by your ignorance. And of course the consultants who throw your own people under the bus. Can't get rid of those now.

It is once again that time of year when we say farewell to our current interns and say hello to a brand new batch.

The two groups overlap for a few days. During this time the old interns show the new interns the ropes, while the mentors silently weep in the lunchroom having realized that nothing that they've said over the last 12 months has had any effect whatsoever.

Some choice quotes:
---
New Intern: It says 'uncaught exception'.
Old Intern: Oh don't worry that will fix itself on production.
---
OI: Did you pull the code?
NI: Yeah, but I have all these weird brackets everywhere... [merge conflict]
OI: Oh yeah that happens sometimes, just delete them.
---
NI: It says "push to master rejected". [we enforce code reviews]
OI: Ohh that means the server is broken. You should tell someone, they have to reboot it.
---
NI: Where did that file save to? [we use ONLY macOS and Linux]
OI: C:\Users\<your name>\My Documents\...
---
OI: You can use either pgAdmin or MySQL Workbench. I like Workbench better but I couldn't get it to work, it kept giving me errors.
---
And of course...
---
OI: No, we don't use Linux. We use CentOS.
---

I did the math today. Only 35 more years and I can retire.

git merge conflict
😁😁😁

I forged a katana once, under the supervision of a swordsmith. Nothing super special like damascus patterning or anything, but the cutting edge was pretty sharp.

Ugh sorry, lame word jokes.

In terms of software...

Microsoft Office Ribbon (cutting edge at the time, lol). Only as a maintenance drone on a bunch of manual search-and-replace work and merge conflict resolving.

Ariane 6 family of rockets (Welding X-rays and other DICOM quality assurance).

Software for continuous flow chemistry, developing microfluidic PCBs to perform Elisa immunology assays during the Mexican flu outbreak. Idea was to eliminate the need for microplates, expensive robots, microwell washers, etc — just have blood plasma, enzymecoated nanoparticles, antigen, conjugated detection reagents and substrates flowing programmatically through a PCB with a spectrophotometer built in.

Indeed a great merge conflict. Unfortunately, this can't be resolved in an IDE also. 😂😂

Today I was talking about merge conflicts with a group of devs. One of them asked if any of us had ever rushed to merge a PR before another dev could merge their PR, knowing there were going to be conflicts. Some were more ashamed to admit it than others, but in the end everyone was guilty of doing it at least once :)

Anyone ever do that to avoid being the one who has to resolve a conflict?

forgetting to fix your conflict before production :) technopolis.bg

Am I the only person that deletes their github repo and then uploads it again when you encounter a merge conflict?

Ready to finally deploy and... merge conflict :/

Did you know? Microsoft added a new feature.

So if there is an IP conflict, our beloved Windows 10 doesn’t cry with an IP conflict error. Instead it sets an auto configured IP which doesn’t even connect to the network sending the user into confusion and a fit of rage.

Thanks Microsoft™

I've run into my first nVidia driver issues. Ever. ☹

I'm attempting to install the drivers on my shiny new Dell XPS15 8750. It has both an Intel (default) and nVidia graphics card; the Intel works just fine out of the box with Nouveau, with terrible fps. Installing the nVidia drivers causes a conflict with those, and X just displays a black screen. I can still interact via the virtual terminals, but with a 4k display it's kind of annoying.

I'm currently trying to install nvidia-bumblebee and related crap, bur it is not going well.

Spent an hour sorting out a merge conflict...

... with myself.

curl 127.0.0.1/robots.txt
User-agent: *
Disallow: Injuring a human being or, through inaction, allow a human being to come to harm.
Disallow: Disobeying the orders given by human beings except where such orders would conflict with the First Law.
Disallow: Not protecting own existence as long as such protection does not conflict with the First or Second Laws.

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

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

I'm just tired of explaining things...

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

I am angry. Do you know why? It's a rhetorical question, because you don't know why I am angry, which is why I'm going to tell you why I'm so. I Followed my friend, " Jane Doe" ( you don't need to know her actual name) to this store in my town. Then these 14-15 years old girls came up to me, and started asking me about my braces. "Where'd you get it?
" How much did it cost ?"
I get these questions like almost every single, and it's annoying. 😒
This one question got me angry. "What 'if' her braces are fake?" A girl said whispering to her friend.
Fake??? My braces are realer than you could ever be, jealous bitch. I said that in my mind, I don't have the guts to say it out loud, besides these girls look like they could tear me to pieces, and I wanted no conflict. I walked away as soon as my friend got her stuffs from the store.
My friend couldn't help but to tease me that I'm a doormat. I guess she's right. 🤔☹😤😟😖

Outlook must have a different meeting in mind than the one I will be attending tomorrow ¯\_(ツ)_/¯

Merge conflict

Unresolvable merge conflicts

me: sees a huge merge conflict

my anxiety: 📈📈📈📈📈📈📈📈📈📈📈📈📈📈

!rant && thanksgivings.

Sure we troll here. Sure we preach strangers here. Sure we hug unconditionally here. But everything is all cool.

I haven't been here very long but I found this community very good to communicate. In fact, we are talking more than dev related things. But I literally don't see any conflict or well.. shit posts/comments.

Really thankful for that. To everyone.

So my company hired this very old guy. The oldest developer I have worked with. I feel they took him just because of diversity.

Because he was absolutely incompetent.

Nothing he wrote ever worked, he got in conflict with everyone, made stupid jokes at meetings, asked the dumbest questions. His stories would hang for weeks, hopping sprint over sprint. Once he delivered something, his code had to be re-written from scratch. A code review couldn't even be applied as the code was worthless, so it just made sense to reassign his tasks to someone else and move on.

So after much drama he was let go. It was maybe two years ago and I recently connected with him on LinkedIn. He's changed four or more jobs since then. Prior to coming to our company he also job-hopped all the time (but most likely he was actually fired every time). His average job duration was like 6 months. Apart from that, he had a 20+ year stay with some government agency.

I fail to grasp how he ever gets hired anywhere with all the red flags. Over two decades with some govt agency (in my country they are all crap). Then change jobs every half an year or so. Then the asshole attitude. And finally, they probably never asked him any technical questions, because he knew nothing. Our interns who were just one month into the job were better by a WIDE margin.

I made a functional parsing layer for an API that cleans http body json. The functions return insights about the received object and the result of the parse attempt. Then I wrote validation in the controller to determine if we will reject or accept. If we reject, parse and validation information is included on the error response so that the API consumer knows exactly why it was rejected. The code was super simple to read and maintain.

I demoed to the team and there was one hold out that couldn’t understand my decision to separate parse and validate. He decided to rewrite the two layers plus both the controller and service into one spaghetti layer. The team lead avoided conflict at all cost and told me that even though it was far worse code to “give him this”. We still struggle with the spaghetti code he wrote to this day.

When sugar-coating someone’s engineering inadequacies is more important than good engineering I think about quitting. He was literally the only one on the team that didn’t get it.

Please let this rebase go through without a conflict...

Landlord sends me an invoice through GitHub.

Landlord: I've pushed this year's rent.
Me: Okay, successfully pulled.

Landlord:

Look at that. The very fucking smart colleague spent 40 days implementing a repository pattern (WHEN WE'RE USING AN ACTIVE RECORD ORM), breaking stuff left and right. Does he use that fucking pattern at the very least?

Of course he doesn't. And along the way he's making sure to create conflicts with the stuff he broke (and I'm fixing). By the time I fix the merge conflicts of one commit, he pushed 6 of them.

Lately I have been overthinking a lot. I am stressing myself out on every single decision believing that decisions I make today will define my tomorrow.

In hindsight, all the major and positive impact that have happened in my life were the decisions I took on the fly without much underlying research. The executional part did have me struggle a little but almost all of the best things happened to me were unplanned.

Funnily this has been my philosophy since years but guess what, I failed to follow it this time.

My overthinking and over planning caused me to mess up a little leading to a lot of unwanted anxieties.

Now let's reflect a little on the past, when my first relationship ended.. wait.. even earlier..

When I was in 5th standard, I was crazy bullied at school but I was happy go lucky and things turned out in my favour throughout till date.

I used to do what I loved and enjoyed. I literally never worried or thought about future. Not even once, things just fell in place for me miraculously.

When my first relationship ended, I was shattered. The darkest time of my life and me being all alone, I came out strong.

I used to live happy. I used to do stuff that I loved. I used to not care about what people thought. No socials for me. I used to follow random dark or counter culture stuff and be a little rebel that I am.

I remember, she and I used to go for fuck tons of events, hangout at waterfront of the city, spend time together and just be ourselves.

I never used to compete, compare, or conflict with anyone.

devRant was (and still is) a digital home for me. Wonderful phase of life.

Then shit went south. I joined Reddit. A girl told me about a pen pal app. Met another girl there.

Joined Telegram again to be in touch with her. She wasn't interested but I stayed on Telegram.

I could pick up any girl in minutes and do so effortlessly.

Slowly the twin extrovert in me came out. I started building and maintaining insanely awesome network.

Started spending more time on Reddit and Telegram.

Joined a bunch of professional communities. Career sky rocketd.

I was still happy and living a gala life at this stage.

Slowly, I realised I was underpaid (via professional communities). That unsettled me.

I frantically started hunting for jobs. 2020 and COVID-19 hit. Being indoors sucked more.

Became more aggressive on job hunt, money, building skills, work work work...

Met a hoe who fucked my emotions and ethics even further.

Got a high paying job. WLB went negative.

I started losing myself. I forgot my hobbies. I don't know what happiness is. I don't remember when I last smiled. I started planning my finances. Overthinking and stressing about shit troubled me into sleepless nights followed by early morning calls made things worse to my health.

I lost the clarity of my life. I FUCKING LOST ME.

I want myself back and I am gonna work for it. That happy little rebel Floyd who never gave a fuck about other's opinion on him or his beliefs. That dude who was shy to talk to girls. The guy who'd follow his passion and not society of high paying jobs or shit.

I almost got my finances and taxation sorted. Now I'll work to get my office timings in place. If not then I'll switch and find a job in UK/EU with a good WLB. And at the same time I'll pursue my hobbies.

Enough of rat race shit. Money has always been an outcome of my hard work and high work ethics. I want to live a life and I am willing to trade of extremely high paying/stressful FAANG jobs for a small company keeping me happy.

I'll be the happy Floyd that I was once was.

Because, the heart wants what the heart wants :)

Got my first merge conflict today 🎉 (haven't worked much with git)

So yay.. I guess 🤔

Fun fact: Git conflict markers are valid Scala.

Storytime!

I got a ticket near the end of the day, asking to install a printer on a computer. The branch in question was in a different time zone (I'm in US-Pacific [GMT-07] and the computer was in US-Eastern [GMT-04]). I figured I wouldn't worry about it; after all, I had other tickets to work on that were much higher priority.

The next day I come into work and immediately get a message from one of my East Coast coworkers, telling me that this branch is calling and asking how the printer is coming. I told him to tell them I would call them a bit later. I do a couple of easy jobs and then begrudgingly call the branch. I listen to the phone tree that they have (which requires two button presses instead of one in order to speak with someone) and finally get in contact with a person... only to have the call disconnect.

I call back and ask for the person who called in the ticket and then followed up, who had apparently gone to lunch. I informed the person that I was just going to install the printer and it would be good to go. This would be fine... up until she mentioned she needed scanning functionality.

Now I wasn't sure if the driver we have in AD is set up with the scan functionality, so I said okay, but that meant I would have to get the driver from the website. The connection to our branches are about 1Mbps, so even downloading Java updates (60-ish MB) take about 5-10 minutes on a good day. The file for this printer was about 700MB (thanks HP). So I went and did other stuff while that downloaded.

I come back after it finished and started the install process. Right away it asks to re-seat the USB cable. So I call the branch. The call disconnects. I call again. It disconnects. I call one more time, and finally get the person who called the ticket in. I instruct him to re-seat the cable. He does. The driver starts doing its thing. I tell him I'll call back if I run into any issues and we hang up.

The driver goes through the install process for about 20 minutes, stops at 99%, then fails. I want to restart the computer, just in case there's a conflict somewhere, but that would require calling the store again, so I put it off.

About an hour later I get a message from another East Coast coworker, telling me the branch is calling about the printer again. I was in the middle of another call and said I would call back later. I do. It disconnects. I call again, and get the person who called the ticket in again. I tell him I want to restart the computer, but wasn't sure if it was okay. He checks with the people using it, who says it's okay, so I reboot. I hang up.

Once the computer comes back up I start the install process again. It asks to re-seat the cable. Fuck. I don't want to call the store again, so I open notepad and say "Please take out the printer's USB connection from the back of the computer."

Three. Fucking. People. Saw it. They moved the window and one even tried to close it, but they didn't re-seat the cable. I opened another window, telling them to call me at my number. They didn't. I called them. Got disconnected. I called them again, finally got someone, told them to re-seat the printer cable again. They do, thank god.

I say thank you and hang up. Continue the installer. It stops at 99% again and fails. I reboot the computer; screw it, I'm just going to install the driver from Active Directory. Check Devices and Printers. It's installed successfully. Hallelujah!

I get the printer set up for the various programs they use and print a test page. I call them one last time; their phone system sounding like they were connected via an underwater line connected by tin cans. I get someone.

$me: Hi, I want to know if the printer has printed something.

$them (garbled): -et me shee... yesh, it -rint-d a *beezelborp*.

$me: Perfect, I'm going to close this ticket! Thanks, goodbye! *hangs up*

tl;dr - I hate printers

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

Don't you love when your team fights about who will merge their branch to dev first?

They don't tell you this is in uni but your skill in merge conflict and circular dependency resolution is more essential in the real world than your knowledge of data structures.

So at this startup i was single iOS dude age 34, android had 1.5 dudes, one older, one you ger. That 0.5 younger was tech director, really good, so they churned for two guys. Millenial, nice guy, never making conflict, just being sleazebag.

Nobody explained to boss why iOS was always late with features, even when i complained. So i got help, 10 months later, project was unpolished but stable, codewise. Now i interview and hire a guy, age 27, who was all yeah dude no problem, and that being my first interview, i fell under his friendly appearance. I ignored a fact that he didn’t know 90% of stuff i was asking him, because he was so friendly and outgoing and we will do anything attitude.

The guy knew very little, was childish and irresponisble. He showed at work at noon. He started telling me what to do, his senior collegue who started the project. He argued about everything that i would tell him. So i spent three to four hours a day charting with him, because we were in different cities. He had two uears of experence, but he was below junior level. And he refused any of my advices for learning in free time. No, he said, thats my free time, you will not tell me what to do. Well, how do you plan on being better, i asked. He said, i learn by doing. But, since he was at his job only six hours a day, instead of eight, and since he was productive only for 2, i guess he was lazy.
He would deliver a UI he would make, without business logic, and tell it is done. Then clients would call me and ask why text fields are not saved..

This all took me month to understand. I lost time, i lost trust, and soon he was fired.

But, soon i was fired also, replaced by another two devs who i had interviewd and formed a team. I was discarded as trash, just like that. I have even worked overtime to catch up with android guys, unpaid.

Took me year to recover mentally from this.

Lessons learned: be objective when interviewing. Job is business, not friendship, trust no one, keep neutral on work. Leave honesty for someone else, honesty will be used against you. Never criticize two girls in office who disturb developers by talking about sex and dicks all the time, dressed sexy, they are girlfriends of people ranked above you. Leave code perfection for your projects.

First rant here, and it's going to be a query to the more professional and experienced members of society (most of you).

I am currently a Sys Admin for a major company, and I develop at night. My primary employment at the moment is the sys admin job (and I code for extra money at nights).

I wanted to start a development department at the company that I am working at, but it was turned turned down. It was stated that we are not branching in development, and that we should stick to our server implementation and support. This was a prompt to me wanting to start studying officially (I wanted to get qualified in JAVA, so that I had some paper behind my name when I looked for another job). HR and my directors outright denied me the ability to study through them (they pay for studies for employees) and I was more than fine with this.

I took a loan and paid for the studies myself. Can't crush a dream, you know?

The director caught wind of me studying, and now has demanded that I develop him a mobile application for the company. I told him that I am not a mobile developer, and that it didn't fall into my key performance areas.

Note, I do my coding on own time, on my own device, and never at work. It's fully my intellectual property. It also in no way interferes with my work during the day, and has NO conflict with my contract this side.

He sent an email yesterday, this is after two months. He is now stating that I WILL do the application, and he has CCd HR and two directors.

I don't want to do the app for this company, I spoke to HR previously about this, and she said that I should try and quote it under my own company name (which I did, but it was denied as it was "too expensive").

Now I am being forced to do something that is COMPLETELY out of my roles and responsibilities, something that this company has ABSOLUTELY no desire to go into further on, and he is basically letting me know that if I don't do it, he is going to start messing with my pay.

I really don't want to do this, and I cannot afford to make my secondary job my primary at the moment. The problem is, too, that I don't have the time during the day to develop AND do my sys admin tasks (I manage more than 300 servers, and 5000 devices).

What can I do in this instance? Or what would you guys recommend, in your experience?

Sorry for the noob question, but I don't know what to do.

$ git add .
$ git commit -m "This HAS to be online soon"
$ git push
*merge conflict*
*did not look at difference*
*using mine*
$ git commit -m "resolv merge conflict"
$ git push

$ ssh root@x.x.x.x
# git pull
# cd /path/to/webapp
# npm run production

Ok, im officially at the point where I can say this and I don’t say it lightly.. I’m really unhappy..
It’s hard for me to be happy anyway but being unhappy is not the same as not being happy IMO..

I’m so angry, especially at the western governments but also at the western society for making everything down that we’ve built over hundreds of years..

I’m socially pretty conservative I’d say. I have my values and manners which are very important to me. I try to be kind, diplomatically correct, hard working and honest but people sh!t all over that. Almost on a daily basis people tell me to “just lie”, it’ll solve the problem or to blame someone else.

What happened to work for what you want? And to “Be honest and loyal and it will pay off”? It’s more like the opposite nowadays..

Lie to everyone you can, cheat your way through every conflict and try as hard as you can to be a victim and all will work out…?

My boss had an interview ihr a grad student and she caught him googling stuff, trying to hide it. I told her to not even consider him but she thought he “deserves” another chance..
someone who applies and lies “deserves”??? You don’t DESERVE anything, you EARN it.. if you can’t earn it then sorry but this job is probably not for you.. not to mention that this guys CV was full of crap..

I just wanna find a woman, buy a farm an go off grid for a couple of years 😅 oh wait.. that’s legally not possible in pretty much any European country.

When you change 200 lines of code all over the place in a class and then realize that you forgot to pull 17 commits from origin 😖

Why the hell do I have to keep showing everyone on my team how to use git. Learn it God dammit!!! Is not that hard. How come you freak out on a simple conflict? Why don't you delete your fucking merged branches?

I love open source and all that fun stuff but I am very unimpressed by having to use GNU/Linux based OS after the last fuck up... the lack of games, stuff that actually works, the almost constant need to compile something and the need to have DDG open at all times because something broke. I mean why the fuck do I need to install libcurl3:i386(for 32 bit programs and games) if there is already libcurl4 and why the actual fuck does it conflict?!... Why the fuck do I need to glue together and compile drivers for my printer?! And they only have "beta support" so like half of the functions that the printer would normally have... Why the fuck don't any games work? Witcher 2? Nope, you click launch and the launcher just closes itself. osu!lazor? Nope, the game will run but only as a process in the background, no window will open no matter what I do. StarCraft: Brood War? Nope, Wine hates the battle.net client and running it in a VM is a really bad idea, the game flickers like crazy... Any other games? Pretty much out of luck... I would really like to play KCD but I doubt it would be playable...

Friend1 (being lewd): I'll merge you in to my git repository
Me: When you try to merge but she has her special days of the month it's called a merge conflict
Friend2: It's not a merge without a little blood

Despite common sense, I think technology is not making our lives easier. It's just build chaos on top of chaos.

Take server-side programming for instance.

First you have to find someone to host your thing, or a PaaS provider. Then you have to figure out how much RAM and storage you need, which OS you're going to use. And then there's Docker (which will run on top of a VM on AWS or GCP anyway, making even less sense). And then there's the server technology: nginx, Apache (and many many more; if, that is, you're using a server at all). And then there are firewalls, proxies, SSL. And then you go back to the start, because you have to check if your hosting provider will support the OS or Docker or your server. (I smell infinite recursion here.)

Each of these moving parts come with their own can of worms in terms of configuration and security. A whole bible to read if you want to have the slightest clue about what you're doing.

And then there's the programming language to use and its accompanying frameworks. Can they replace the server technology? Should you? Will they conflict with each other and open yet another backdoor into your system? Is it supported by your hosting provider? (Did I mention an infinite recursion somewhere?)

And then there's the database. Does it have a port to the language/framework of your choosing? Why does it expose an web interface? Is it supposed to replace your server? And why are its security features optional again? (Just so I have to test both the insecure and the secure environments?)

And you haven't written a single line of code yet, mind you.

So it's been a while since I've posted as my first few months at the new job have been amazing. But now I'm running into issues with a team member that I need to get off my chest.

So my new job is front end development in React. I'm brand new to it but I was promised time to learn on the job. On my first day the team member I'm now having a conflict with offered me help. He's the most experienced so I gladly took it.

But now several months in I've noticed his teaching style doesn't work for me. He'll go into long theoretical explanations whenever I ask a question and I get overwhelmed with info. And he gets frustrated with my inability to process all that, because he feels I waste his time. So frustrated that at one time he just walked out of work and drove home, which was really upsetting to everyone.

My direct manager and my mentor in the company (our software architect), as well as our scrum master (a consultant) are all aware of the conflict. I've been assigned another colleague to help me out. Things were going ok but he got sick so I had to turn back to the team member with the conflict for assistance. Of course frustrations arose again.

Now yesterday during our sprint planning meeting we had to say what we liked and didn't like about the past sprint. And I brought up I feel I need time for learning and that I don't know where to put that, since we don't have a task for it. I said I also felt past approaches weren't working out and that I'd like to take up the offer to go on training. I was trying to word it very neutral to not upset my colleagues, as they tried their best. But the colleague who I had previous conflicts with took it personal and accused me of not listening and that is why my code is awful. While all I've been doing is rely on his code to learn. Long story short it got very heated and direct manager and scrum master who were present had to shut it down.

I'm thinking of talking to my manager and mentor today. It really hurts when you're accused of maliciousness when all you did was try. I know my code isn't perfect. But I get no help in improving it beyond long winded explanations about theory. If I ask for practical help he says he won't write my code for me. Which isn't what I expect. When I say I followed his example he says I shouldn't copy. But two sentences later he says if I don't know what I am doing I should listen to him. It's really very confused and demotivating as a beginner, but he makes it about how I waste his time and ruin his job for him. I understand he tries his best and that it has to be hard when someone seemingly is as dumb as a bag of bricks. But my manager and mentor told me they support me as long as I continue to show improvement. So I asked for alternatives (training, time to study, or whatever I haven't thought of) and now I feel like the bad person. I'm already someone with crippling low self esteem, and I'm thrown into the deep end. It kinda sucks when someone then tells you from the sideline you can't swim and how swimming works. How about tossing me one of those floaty things and then maybe accept I need to hold on to that for a bit and my technique will need work until I can make it on my own? :(

I have 99 problems but a merge conflict ain't one of 'em

I solved this riddle/puzzle. Now my inner completionist split into two and both are arguing what is worse: taking the solved puzzle apart or leaving the 15 remaining possibilities unsolved...

*rips of his face* 💀

Hiding my secret side project that I spend 69% of my free time thinking about and 11% of my free time working on.

porra; caralho; toma no cu.

this fucking shit xamarin. I wish the ass who programed the xamarin vs2017 integration to go fuck off.

srsly, I just want to fucking code this fucking fucker VS2017 keep shitting all around me

first I was gonna install it. didn't install because no memory left. fair enough, my fault there.

cleaned 35 gbs.

finish installing VS, with xamarin. FIRST GOD DAMN TIME I create fucking project, 2 fucking errors and 3 warnings. I DIDN'T EVEN TYPE A COMMA.

ok, tried fucking it. it seems to be conflict between version of Android and xamarin forms. fucker you it shouldn't be like this. anyway.

tried downloading the updated Android version.

it failed at 80%! what error you ask? missing fucking space ok, fuck that thing is huge, ok, my fault again. uninstalled all programs I was not using, all projects I'm not current working on. more fucking 30GB free. tried again. ANDROID IS TOO FUVKING HUGE CAN'T INSTALL IN 30GB!!!

Ok. instead of updating android, gonna downgrade xamarin, can't downgrade. ok gonna remove and install an early version.

unistalled. CAN'T FIND XAMARIN DLLS.

I was like, fuck this project, gonna start a new one. ok, all seems fine, for some weird reason. Except no. I try adding a new page, ops, APPARENTLY VS2017 CAN'T LOAD A GODDAMN .XAML

Ok, I can create a .cs page. done, except now I get a fucking timeout error. fuck.

I search the internet for a workaround, see a guy saying I could manually add a .xaml + .cs by creating this files and then adding them to the proj file.

did it. I go again, everything seems fine. but now I can't freaking reference the damn page.

I'm fucking losing my mind here.

In the mean time I have to turn in this project at the end of the week AND I CAN'T FUCKING OPEN THE GOD DAMN FREKING PROJECT PROPERLY!

FUCK. MY. LIFE.
FUCK XAMARIM AS WELL
FUCK VISUAL STUDIO
FUCK MICROSOFT
FUCK THAT DAMN SSD
FUCK THAT BOSS WHO THINK THAT A 128GB SSD IS ENOUGH
FUCK IT ALL...

Are you ready for the only really useful advice on devRant that is not judgmental, simple, and instantly applicable?

Here it goes. If you have hiccups,
1. Inhale your full lungs until you can’t inhale anymore
2. Hold your breath as long as you can
3. Exhale carefully

This will “reboot” your breath cycle, and that conflict between breathing and other things that causes hiccups will go away.

Repeat if needed. Breathe slowly and carefully after you finally exhale.

Dear God please if you help me fix this merge conflict, I'll be a better person.....please

......please 😭

Sometimes I have to work with physical hardware. There are over 300 machines in our lab, split among two subnets. But for some reason, I can never access my machines by hostnames.

Every other week, there's an IP conflict on this network, requiring me to log into the active directory server and delete old DNS entries. This usually happens because someone decided to deploy 64 VMs on a huge server, all at once, didn't boot them with a delay, let alone with with a warning to IT.

Then when my superior asks how my progress has been and I respond with "I can't even get the machines to ping each other by hostname, there's something wrong with the DNS:, I get the following response: "HOW COME NOBODY ELSE IS HAVING PROBLEMS WITH THIS. YOU'RE FULL OF SHIT", from someone who spends 90% of the year abroad, working remotely.

The people. I find devs to be (obvious generalization) prone to: not take criticism, not understand the difference between fact and opinion, not understanding that it is perfectly acceptable to change your point of view when presented with new information that will conflict with what you currently believe in. It is a sausage fest brought to you by eons of very fragile male ego in the making, and many other qualities that were very much diluted in a lot of the other fields I have worked on: from retail (shitfest) to import/export all the way to military (another shitfest, for different and rather dangerous reasons).

I have met some amazing people in the field, don't get me wrong, but the quirkiest of mfkers i have met make me believe that maybe I AM the one that does not belong in the field (top kek).

On a more technical side, basic stuff like reading comprehension, attention to detail, the ability to translate complex problemd to pieces and that interconnect among the themselves, the ability to understand the grand mathematical scheme of things, the ability to be patient and despite what the above generalization would have you believe...the ability to communicate with other humans with tact and understanding as well as a spirit of collaboration, etc etc, are definitive traits to consider if you want a career in software development that leads above just being a code monkey.

Shit like that.

TIL Python doesn't really give a fuck about semicolons -.-

So after spending the past couple years almost exclusively using C# and Unity I decided to come back* to Python for no real reason except wanting a change of pace.

I almost ripped my hair out backspacing semicolons I kept putting in out of force of habit after having worked in C# for so long

Well guess what... I just learned (purely by accident)... Python couldn't care less. I feel internal conflict if that makes sense.

TBH now I'm randomly putting in semi-colons at the end of some statements just because I can and I want to abuse this freedom ^_^

Yeah yeah it's not very "pythonic" or pretty but screw that

* I started programming in Python back in high-school but switched over to C# + Unity after graduating and pursuing indie-gamedev.

Note: After some searching I realize you can use semicolons to have multiple statements on the same line but I never really needed to do that during my time with Python so I didn't even remember it was even a thing

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

Doesn't matter how many years I do this job, a merge conflict will always stop my heart for a good few seconds.

Had my first merge conflict now and I'm already pissed off.
Luckily GitKraken helps.

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.

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

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

I lost a week's worth of work due a git conflict, please kill me now.

99 problems but a conflict ain't one

Expectation: Today is the last day before holidays and yesterday I completed a complex task, so today I'll have a very relaxing day involving implementing only some simple changes.

Reality: I've just solved a dependency conflict between the project I modified yesterday and another project depending on it that caused the failure of some tests inside the latter panicking my coworkers who quickly asked me "WTF you merged in the core project!?!?"

Yeah, I really need these holidays.

"play to support children affected by conflict" yeah would be great, if they weren't all free to play fucking games about war...

Surely docother games that cost money and simply donate the proceeds from them towards charity

Oh so you have a merge conflict this weekend? The only time of the week I try not to think of ripping your nob off, tying a noose around your neck with it and drowning you in a well full of piranhas? Right, right...

How about you take that dick that you've been trying to locate since you were 5 and practice choking on it every day till you die just so you have enough experience to suck demon dongs in hell for eterniity! I seriously hope you die of cancer you fucking wankstain!

How about you go home and keep disappointing that whore of a wife of yours, you know that stinking pile of shit that you stick your dick in every two weeks?

My friend is learning PHP and I told him to install xampp but that fucker went nuts and installed MySQL too which didn't allow the xampp's SQL and ended in conflict.
Oh man that's so funny when non programmers don't do what we say.

Do any other devs here have serious entrepreneurial ambitions and the drive to achieve them?

How do you manage the conflict between your day job and your ambitions.

I find every employer is looking for someone with just enough ambition to “move up” in their company but any ambition of your own outside that seems to come off as threatening.

I try to keep the 2 separate but I have always thought that by not wanting people with actual ambition a company is only hurting themselves.

Thoughts?

Pro of not using Git

* No git conflict

Sometimes I feel like my motivation to learn and expand my knowledge is in direct conflict with my actual ability to learn.

Goodbye Duckduckgo, DuckDuckGo’s CEO Gabriel Weinberg announced on Twitter that his privacy first search engine will be manipulating its search results to only show users what the company deems not to be “disinformation” about the Russia-Ukraine conflict.

When you are involved in a conflict of interest project and its kept under wraps ...but your IT director still wants you to do it because his friend needs something done but don't want to pay for it

Who else has faced this? Or am I the only one...?

Clone the whole fucking repository again, whenever a merge conflict arises.

Almost a year and a half. I was so overworked and my failures were so impactful. I would go home and obsess over work all evening and have fever dreams on nights that I could sleep. It was so mentally painful that I was going to jump off a building after a few drinks to make it stop. A military turned civilian doctor told me that I showed symptoms like soldiers in prolonged conflict. He told me “quit or it will kill you” without even knowing about the suicide stuff. So I quit the job and to this day still suffer flashbacks and have crazy mood swings.

Burnout is real. Dangerous stress is real.

Oh, gather 'round fellow wizards of the code realm! 🧙✨ Let me regale you with the epic tale of software sorcery and the comical misadventures that come with it! 🤪🎉

So there we are, facing the dreaded Internet Explorer dragon 🐉 - an ancient, stubborn beast from the era of dial-up connections and clipart-laden websites. It breathes fire on our carefully crafted layouts, turning them into a pixelated disaster! 🔥😱

And then, the grand quest of cross-browser testing begins! 🚀🌍 One moment, your website is a shining knight in Chrome's armor, and the next, it's a jester in Safari's court. A circus of compatibility struggles! 🎪🤹

CSS, the arcane art of cascading style sheets, is our magic wand. But oh, the incantations can be treacherous! A slight misstep and your buttons start disco dancing, and your text transforms into a microscopic mystery! 🕺👀

But fear not, brave developers! We wield the enchanted sword of Stack Overflow and the shield of Git version control. We shall slay bugs and refactor with valor! ⚔️🐞

In this enchanted land, documentation is the mystical parchment, often written in the cryptic dialect of ancient monks. "This function doeth stuff, thou knoweth what I meaneth." 📜😅

And meetings, oh the meetings! 🗣️🤯 It's like a conference of babbling brooks in the forest of Jargon. "Let us discuss the velocity of the backlog!" 🌿🐇

But amidst the chaos, we code on! Armed with our emojis and a bubbling cauldron of coffee, we persist. For we are the wizards and witches of the digital age, conjuring spells in Python and brewing potions in Java. 🐍☕

Onward, magical beings of code! 🚀 May your bugs be few, and your merges conflict-free! 🙌🎩

Today,
I tried setting up XAMPP for running my friends code.. it took 5hrs and faced atleast one issue in every step from installation to running.

First
1) XAMPP Did not download itself, found that internet was down.

2) downloaded finally, installation phase went till 98% fatal error, windows collecting info for diagnosis

5)after 3 tries , suddenly it installed successfully

6)Apache force shut, every time I started it

7)1.5 hours later found VM had occupied the port 80, making it shut.
Changed the port

8)PHPmyadmin was recent ,that SQL 5.1 support was not There.

9)Now after setting up new instance of MySql 5.6 , created conflict.
Project referred one instance and PHPmyadmin referred other

10) Changed port numbers and added service entry in windows to make it work

At last the struggle ended up with happy ending.

My installation story precisely

Iam new to PHP development and XAMPP.

Tfw when you're lying down falling asleep and realize you didn't commit your work but you turned off your computer.

Hey guys, love this app, and the funny devRant cartoons on their YouTube channel 👌

!rant

Some serious conflict right here

Ok... I hate databases... ( subject )
I can’t understand a single thing 😭😭😭
What the hell is view and conflict serializability!!!
Tomorrow is my exam... 😭😭😭😭

If someone can tell, it’ll b extremely helpful 😨

Man I currently have a burning hot passionate desire for physics. It actually gets me so damn excited. I mean it is basically damn magic ya know. But then I have a passionate desire for programming and that gets me excited. And then I have a burning desire for Math and that gets me excited as well. But I don't know what to push my life towards because I want to focus more on my ultimate goal. It's like having to choose between 3 amazing girls(not that I would know how that feels)

Check in, check out, punch in punch, out, wax on (my balls), wax off. Do your duty. Be a good citizen. Work overtime. Conserve the environment: buy a tesla that runs on afghan lithium conflict minerals. Post your life to facebook. Get married. Have exactly 2.5 kids.
Use jquery. Use knockout. Use react. Use vue. Use svlete. Use heroin. Used needles. Used people. Used toilet paper. Toilet paper apocalypse. Social trends. Be a good citizen.

Watch tv. Watch nightly news. CNN says. Fox news says. Hey, did you read this article by important funny guy on tv? American taliban. Scary. Be afraid. Hey did you read this article on cute puppies? Funny! Did you see this meme? What a funny meme! HAHAHA. Do we need prisons for dissidents? Do we need to release all the prisoners in federal prison? Should we round up people who dont follow health authorities? Science says. Science is wrong. Science is right. Man in robe agrees with me. Man in robe disagrees with me. You're evil. These people are bad. Is doing bad always wrong? Should we tolerate intolerance? Its time to stop tolerating intolerance. Be an individual, like everyone else. Be you. Be the best you that you can be. Individualism. But we're all in this together. We're all different and unique. But we're all the same. Love each other. Love humanity. But not these guys over here. Punch a nazi. Punch a commie. Isn't it time we punched a nazi? Isn't it time we had socialism? Isn't it time the old get out of the way for the young? Why are the old hateful? Why do they horde all the money? Do we need rent controls? We need rent controls. Its time for rent controls. I think I believe what others believe. Believe different. Think different. Apple. An apple a day keeps the windows away. Open windows, a breathe of fresh air. Is climate change real? We need to have a national conversation about climate change! The world is freezing. The world is flooding. We're all gonna drown. The world is overpopulated. We need to talk about overpopulation. People who have too many kids are polluting the world. America doesnt have enough kids! Is it time to bring in more immigrants to have more kids? Who will work the fields? Thats racist. Is racism an epidemic? Is white flight an epidemic? Lets talk about epidemics. Lets have a conversation about mandatory vaccination. Lets have a national conversation about mandatory pandemics. I mean, vaccinations. Lets change the world. Trust the science. Don't trust the science. Bu-bu-bu-bu-bu I'm loving it. Love who you are. Live love laugh. If you don't love me at my best, then you can't handle me at my worst. People who disagree with [current year] are the worst. Is it time to regulate speech? Its time to regulate speech. Should there be laws against hatespeech. I think there should be laws against hatespeech. People who upset me should go to jail. Its current year. Think big. Think outside the bun. Have it your way. All the time, always. All for freedom, freedom for all. Because this is america, and current year. I like to work hard. But you have to remember to play hard too. Work hard. Play hard. With a childlike sense of wonder. Be you. Belong anywhere. Just do it. Challenge Everything. Because you're worth it. Save money...live better...have an abortion. You're in good hands. Democracy dies in darkness. Is it time to regulate hatespeech. Politician in current year is hurting our democracy. War is a racket. We need to liberate afghanistan. Why are we bombing afghanistan? Its there culture. They're oppressing people! Don't criticize anyones culture. Be kind. Rewind. Go further. Lets go places. Because Impossible is Nothing.
Lets change the world. I'm a smart passionate funny guy with a childlike sense of wonder and play. You ever want to travel? I want to travel. See the world. Eat new food. Eat. Love. Pray. Eat love. kill. Is meat murder? I think meat is murder. Go vegan. Go home. Order out. Support your local economy. Think global, act local. I'm a good corporate citizen. Be the change you want to see. Did you hear about this local brewery? Do you like craft beer? Hey try this new IPA. I shared it on twitter. Twitter is a very important part of my life. I think what other people say matters, and them reading what I think matters. What I ate for lunch matters. Hey what did you eat for lunch? I LOVE FOOD. You want to order door dash. There new commercial is amazing. Commercials are SO FUNNY. Hey did you see this meme of this commercial? I shared it on tiktok. Heres a funny dance. Watch these nurses dance. I wish I could dance like that. They're so overworked. So brave. Our hospitals are overflowing. People are dying. Hey did you see this new dance trend on tiktok? I like tiktok. I think its a very important part of life to share your life with others. Nurses are dying. Look at this image of hospitals. Scared. Very scary. Very bad. Bad and scary. Big thoughts! Thoughts and prayers!

Because Yes we can!

Beep boop.

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

Bitbucket full of dicks!!!

Dude just pushed merge conflict comments!!! At first he was like I did not do it, so I was like git blame bitch! Now he is like it wasn't my fault so what I used force push!

Well that was it I will leave this unholy company!

Merge conflict in xcodeproj. Noooooooooo 😭😭😭

In the light of the recent events.....

I've almost made my peace with the fact that I will probably be nicked in the upcoming few years, as well as many others trying to stay free and/or flee countries in conflict. I just hope it won't be too long and agonising.
Thanks to the miracle of the internet, I will still be alive there in a form of online profiles and my posts/rants here. Maybe retoor's dR-trained LLM will be able to mimic me well enough to trick you all I'm still out there :))

just some doom and gloom shower thoughts.. running circles in my head for years now.

I hate my coworker. I'm currently working in IT, but both my former full-time programming and my IT work has taught me how to dig for things and find them. He has learned this, and is CONSTANTLY bringing me things that have NOTHING to do with my job because he's too fricking LAZY to do it himself.

"Hey, there's a credit memo on this Amazon statement. I'd like to know what it was for, thanks."

SO LOG ONTO AMAZON AND LOOK FOR IT WITH YOUR OWN TWO EYEBALLS. I've got my own work to do without doing your AP detective work for you. THAT'S PART OF YOUR JOB.

But unfortunately I REALLY hate conflict and so I just do it for him, seething the whole time and knowing I've just reinforced the behavior.

EDIT: Before anyone says it, no it is not because he's stuck. If someone is at the end of their rope I'm glad to help them. But I've taken to asking him "so what have you tried?" And every single time he says "nothing." It's gotten to the point he'll literally say, "Hey can you do this for me? I haven't looked at it at all or tried anything." But he just doesn't catch on.

I released an Android lib on JCenter.

So far so good. What I didn't realize was that I had a terrible bug related to a content provider.

Since I was using the ContentProvider to make my CursorLoader work, if someone installed an app with my lib, you couldn't install another one with it because it would conflict the providers.

I had to quickly find a solution and dispatch a new release.

I would like to stop and genuinely thank the devs and anyone that contributed to NW.js for allowing users to work outside the sandbox. Fucking sandboxes these days make developing editors and tooling a bunch of bullshit hassle. I understand why, but it makes an entire class of software that much more difficult to develop.

And on a semirelated note, I decided to go with nw.js because unlike electron, I don't have to tell users "just install these two gigabytes of npm dependencies *from off the net after already downloading the main application*, dependencies that could break at any time at all for any reason."

Does anyone even bundle their dependencies any more or is this something only clinically insane people like myself do?

Because last I checked most users still don't know how to debug console autobarf when a single command goes awry due to something obscure like a version conflict between two brittle cogs in the organ grinder known as package management.

Edit: also, nw.js startup times and memory requirements are relatively sane compared to electron.

I miss psychological safety. I'll define it as the willingness to be vulnerable to criticism and the belief that contrary opinions are embraced and judged on their merit.

When I first entered the startup scene my manager had exceptional candor. He had no qualms talking about how kids and personal projects caused his investment in his work to wax and wane.

He always made time to talk to me when I was frustrated and made me feel like he truly listened to what I had to say, even if he didn't act on it.

At the time, I attributed the safety to the company culture created by the CTO. The startup failed and eventually, I found my way to that CTO's next startup.

Completely different experience. I find myself in despair as I hear "I'm more senior and therefore am right and don't have time or interest in your ideas" blatantly stated.

When I disagree with people, I try to ask clarifying questions to identify where the divergence occurs. Sometimes I'm surprised and learn something new, sometimes my questions prompt reconsideration.

With the CTO (now CEO), we go in circles where he squirms, deflects, and outright refuses to respond to my questions. He cancels 75% of 1:1's and when we do talk he suggests that if I disagree I "should introspect which of my beliefs is holding me back from embracing his superior way of doing things"

Multi-hour slack wars suck the life out of anyone trying to ask questions. It's so exhausting to ask questions it's often cheaper and faster to wallow in despair for an hour and hack something together than descend into people shouting preferences at each other and shaming me for not already knowing the answer.

Perks, pay, and tech-stack are all cool. It feels selfish to be unhappy because I can't innovate or challenge the status quo. Having tasted that safety though, I'm left with an unquenched thirst that grows stronger with every conflict.

Okay, seriously, who invented merge conflicts? I want names! It's like playing Jenga with code, hoping your masterpiece doesn't topple over. I've seen more ">>>>>> HEAD" blocks than actual code lately.

Can we all agree to commit more frequently and save my sanity, please?

Yall thought heart breaks are painful, wait till you have a merge conflict.

SQLite DB + Google Drive == Love

Just ran my app installers (in projects folders that i copied) and set the DB file on startup.

Could end up with a merge conflict if the app is running on both PCs at the same time though... hm....

I was supposed to have an interview for a software developer internship at a bank today, but they rescheduled last minute due to a "time conflict". This was to be my first summer internship interview. As if they didn't put me under enough stress already... Now I find out all my stress all week long was for naught.

God fucking dammit.

Sample Merge Conflict 🤣

TL;DR Calendar services sucks.

Imagine yourself as startup. You don't want to spend fortune on paying $5 per user per month for Google Services. Also you don't want to pay that to Microsoft for O365. You want to run it itself because you already have droplet running with your other services (ERP for example. Funny story too btw.) Ok, decision has been made, let install something.

I have pretty good experience with OwnCloud from past as Cloud file sharing service. Calendar is not bad for single user purpose (understand it as personal calendar, no invitations to others, sharing is maximum I tried) What can possibly go wrong when I deploy that and use its Calendar?

Well, lot. OwnCloud itself runs well (no rant here) but Calendar is such pain in ass. Trouble is with CalDav under hood and its fragmented standards. So, you want to send invitation to your team for recurrent meeting. Nothing weird. It sends as one invitation to each one, good. Now you realize you have a conflict, so you need to change time of one occurence. Move it, send update. And here comes shitstorm. It is not able to bisect one occurence from series. So it splits it to separate events and send invitation for every single one. 30 INVITATIONS IN 2 SECONDS! Holy sh*t! You want to revert that. Nope, won't do. So you accept your destiny and manually erase every single one with memo in head about planning recurring events.

Another funny issue is when SwiftMailer library (which is responsive for sending e-mails from OwnCloud) goes to spamming mayhem. It is pretty easy to do. When e-mail doesn't comply to RFC, it is rejected, right? So if because of some error CalDav client passes non-compliant e-mail (space as last character is non-compliant btw) and SwiftMailer tries to send it to multiple recepients (one of them is broken, rest is fine), it results in repetitive sending same invitation over and over in 30 minute interval. Sweet.

So now I am sitting in front of browser, looking for alternatives. Not much to choose from. I guess I'll try SOGO. It looks nice. For now.

O Friends, It Is Great To Be Writing To You Again. Let Me Share With You A Most Amazing A Tale! I Have Spent Some Time Now In CapitalizedCamelCaseLand. It Is A Glorious Land, Where All Written Word, Language, and Culture Is Governed By The Almighty CapitalizedCamelCase. The People Are Productive And Extremely WellTyped (A Phrase They Charish And Use To Mean General WellBeing).

The Honorable Citizens Of CapitalizedCamelCaseLand Have But Few Fears... And I Shrink To Speak Of Them Or Even Write Them Here, As It Is A Heinous Crime To Even Mention Or Write These Words... But I Must Report, As It Is My Duty... So, Their Fears: The Horrible And Most Repellant lowerCamelCaseJavaScriptianDevils, Or Even Worse, The Grisly And Ghastly snake_case_fiends_of_pythonia!!! O My Friends How It Fears Me To Even Form Such Foreign And Strange Characters And Symbols That Remind The Citizens Of CapitalizedCamelCaseLand Only Of Pain And Suffering!

Many Wars Have Been Fought Upon The Lands Of Both JavaScriptia and Pythonia (The Cultural And Correct Way To Refer To These Harsh Lands In Respectable Company), But To No Avail Or Final Stop To The Fighting. While CapitalizedCamelCaseLand Is Currently In A State Of General Peace And Prosperity, There Is Surely A FlareUp Of Conflict To Occur Against The JavaScriptianDevils Or The PythonianSnakeFiends!

For In DevWorldia (The Name Of This Strange Planet I Report From), There Has Rarely Been A Time Of Peace Lasting For More Than About 5 Minutes, Which The Citizens Of CapitalizedCamelCase Assure Me Is Already A Massive Length Of Time And Achievement To Be Cherished.

Alas, I Beleive In The Coming Days I Must Travel To The FarAway Lands Of JavaScriptia And Pythonia. I Can Only Hope That I Am Also Treated With Kindness And Respect In Those Lands By Attempting To Emulate Their Ways, Just As I Have Here In CaptializedCamelCaseLand. I Hope To Write To You Soon And Wish You Well.

Signed And Sincerely,

Language Traveler FullStackChris

they say everything "old" is better, but in programming, dependencies in C was a mess. Shut up. Sometimes C is a cult enforced by those who don't even write in C. Now I build my projects with Parcel in less than a second with no configuration. It uses a full-blown AST for everything. If I want more performance with similar DX, I use fastpack, bringing build time down to tens of milliseconds.

art? charli xcx, sophie xeon, death grips, just to name a few. they made things that weren't imaginable before, ultimately pushing music forward. Hendrix is good but they're just incomparable in terms of beauty, complexity and sophistication.

literature? every old book I read feature same conflicts. they are so similar it's almost boring to read them. meanwhile, Erlend Loe delivers a complex idea without using a conflict (!) and without any character changes. that's insane.

"older is better" is getting old. it's time for you to seek for some other reusable gibberish to insult what other people create.

finally, let me remind you that you, my friend, create nothing.

When you try to merge branches :D

Needed money for my company, not enough clients to support business on SaaS alone. Took on a 5k / month job building a platform that competes with my SaaS (more niche, less generic). Also sign up new client who that company's owner is part owner onto my current SaaS. Win / Win?

I do a lot of custom work to my platform to fulfill their needs, which is why I ran out of time for the 5k / mo project. I did these customization for free. Losing money to keep client, but also improving my system.

Work gets busy, I need to drop the 5k project. Client is upset I am working more on his other company (he is not majority owner). I return 1 month of funds to the owner and say I cannot continue.

Owner threatens to make other company that he is part owner stop working with my software if I do not complete project. Blacklisting...great. I agree to work with an overseas developer to do it and PM it for 3 months at least. Making nearly nothing from it (now 1k / month for PM), working nights to deal with India, losing sleep...

Other company suddenly folds due to conflict of egos with that SAME owner. Users drop from 16 to 1. I drop the project, no more strong arming me. Everything is a loss, all effort and money lost for nothing. Bad bet..however...

Owner becomes 100% owner of the other company, and of the software company. I transition him to PM his own project, he still uses my software because It doesn't, nor will it, ever do what the one he is building does. Also, partners from previous company break off and use my software again. New Client. #profit.

But holy hell was it stressful in the interim. People's business tactics are disgusting. Stay calm, play it neutral. Win. Sometimes you have to do what you don't want to do in order to succeed...at least for a little bit.

I was so scared that how he screwed his partners he would screw me over as well if I built one of the modules I have planned for my System, but haven't done yet.

If I did it for him first and then built my own (totally diff codebase) I really didn't want to run into any legal issues considering the schematics he has now are mine, but I didn't finish that part of the system for him. He is obivously highly competitive. Even though he wanted me to, and still does, want me to run his company for him.

Who knows, maybe in the future. To be CTO / COO of two SaaS CRM's in the same space may make sense. But I will never sell my software to him or partner with him. Too much drama. Avoid the drama. Be careful out there fellas.

If you are a creator, people will take advantage of you in every way imaginable. Read the fine print, read the people, document everything. Don't put yourself at risk.

dev_storyV1.1 (without merge conflict)
Thief: Quick! Hand me your wallet and backpack
Dev: *hands over the empty wallet, takes laptop from bag, pulls from remote, pushes all the commits to remote, deletes local repo, puts laptop in bag, hands over the bag* Here you go mister *sighs*

principle software developer who does not code, design, or architect,

instead, do random eslint fixes which create conflict with everyone's branches.

1 line of code "fix" per commit.

there goes 26 commits

How to deal with merge-conflicts:

1. You don't
2. Just clone the whole repo anew again and start over dude

today:
Committed my code for Code review
solved 23 Merged Conflicts
Fixed 65 Load project Error.
Fixed another 8 Compiler errors because of mistake made in Merge conflict.

I wanted to do coding today... I really do..

My Cat-magnets make me smile every time I look at them!

OfferZen gives the best swag for developers in South Africa!

I recently started a new job where I’m working with someone who is vegan. This is great and I have no problems with it at all. My diet also leans heavily towards vegan and I understand and sympathize with the reasons that can lead to this choice.

However, I seem to keep ending up in inadvertent conflict with my colleague in ways that surprise and baffle me. For example:

* After buying and showing him a vegan product I had just purchased (and commenting that I had done so in the hope of avoiding a more animal-product based health solution), I found myself harangued at length about how healthy non-vegan foods weren’t actually healthy, and “Would you eat a human? Have they done trials on the benefits of eating humans? No? Exactly!”

* I sent an all-office IM asking if anyone wanted a cheese sandwich I had accidentally bought (accidentally in that I thought I had bought a different filling). I received an email back from him demanding that I don’t include him on any further “offensive” emails. This was followed up by an office update telling all staff to use work communications appropriately.

I enjoy my job and I did enjoy working with this person, but now I feel quite thrown and unsure of how to react to him. I’m pretty annoyed at being accused of being offensive for my use of the words “cheese sandwich” and don’t want to bring it up as I can’t see a way of that conversation going well (I’m not planning to apologize; I don’t think I need to?!). I realize the obvious solution is just to never ever mention food (or nutrition or words that aren’t vegan) again, but I need help with how to get back to a place where I feel like I am comfortable in my work environment rather than slightly on edge in case he kicks off at me again for some insane reason.

I'll never use code hacked by another dev for work.

I got code that only solves one single fucking use case but there are way more to consider ...

The way the problem is solved ... not dev friendly to use, clean code is non existend and did I mention that it doesn't solve many other important use cases?

All has to be refactored and rethinked and everybody complains about why it takes so much time and the code should not be a technical masterpiece.

I'm sick of these bullshit devs, not taking their role as professionals serious.
Devs should not only learn how to code but also to work as a professional. Soft skills shouldn't be optional and the way how IT is seen has to be reshaped.

There are reasons why in these days the developed software has a lot of bugs and is not flexible. Everything has to be done now, changes come so often that they conflict with previous ideas and nobody knows the complete customer specification so the conflict shows in dev phase up.

Most devs work like they are in a hackerspace. Stop doing this.
You can do this in your freetime but stop doing this when you work in a professional environment.

That sensation when you got a git conflict on friday evening 😨

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

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

In Jenkins everything f*cked up...

Why ??

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

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

That's was a day off.

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

PS2 : learn git damn

Today I heard from a fellow worker: "Why this lot of conflict in this branch, the conflict that I have at home is enough".

First job while in college... Was working for web dev team lamp set up before lamp was lamp (year was 2000).

Had deadline one week after summer vacation. Worked non stop a couple of days to get shit done and didn't make it. Got in a conflict with my manager in front of the team and I blew my steam off. Quit on the spot.

Lessons learned:

1. Don't be a fucking idiot when estimating work.
2. Be cool with other teammates, nobody cares about drama and nobody has to feel sorry for you.
3. Uhm, plan? Had entire fucking vacation to get work done. I was a fucking moron.
4. Burning out is stupid and unproductive.
5. Your manager can be as poor in management as you are. Your job is to try to make them better at it, as they have less visibility in the details.

Next job in grad school. Worked for a security company. Direct manager had the bright idea to make execs sign the change requests. WTF. Code was in Perl/php, a mess. Team rewrote back end DB access , taking over six months, or more, failing twice the deadline. After a final 48 hour burn out, we ship and get laid off the week after.

Lessons learned:

1. Don't work for dicks.
2. Don't be a dick yourself.
3. Don't work for dicks.

Third job was in silicon valley. It was a great company, and I stayed there for five years.

Thanks for nice conflict detection !

"web developer" 😂👌

merge conflict on release

I just love it how team git & team TFS managed to migrate same fuckin project several times from one source control to the other and back.. and they all root for their source control as it's the bestest of them all.. yet when presented with specific conflict situation and asked how to most elegantly resolve it I get an 'ugh, I don't know, I've never worked with anyone else on a project let alone on intertwined parts so I never had to resolve conflicts.' -.- Dude, wtf?!

* package-lock.json * merge conflict

ME: fuck fuck fuck, C-s I-Search: HEAD
ME: this shit is much i can't handle it, fuck

ME: rm package-lock.json ; npm install

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

The best part of being a developer is that you can work and develop at the same time without conflict. Even when you're not on the team.