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

When you have a merge conflict

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.

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

I created merge request #666 earlier today. And of course, it had a merge conflict in it. 😈🤘🙅

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.

A quick note about node.js security.

Decompiled Discord, a widely used chat app. Found 5 vulnerabilities (that are now reported.) Why? Severely outdated dependencies.

Cloned Mattermost, a business communication app like Slack, but open source, and (from their site) the Department of Defense uses it. Found 10 vulnerabilities (that are now reported.) Why? Severely outdated dependencies.

I get that some versions conflict, and in a fast moving enviroment, that is a huge risk - but update your damn dependencies.

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

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

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

What happens when two developers get married?
They merge

"Have you ever been in a conflict?"

Yes and it usually is resolved by deleting files then recloning

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

Took only 10-20 mins to resolve merge conflict

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.

What your file looks like when it has 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 😂😂😂

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

#Merge Conflict

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

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

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

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

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 to do if there is merge conflict? :O

What do you guys think of my setup?

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

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.

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*

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.

Merge conflict

git-rebase-no-conflict

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 (ಠ ͜ʖಠ)

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

Sometimes the worst part about being a dev is:

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

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

git push -f 😂

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

There is no conflict.

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

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!

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™

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.

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

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.

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.

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?

git merge conflict
😁😁😁

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

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

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. 🤔☹😤😟😖

Merge conflict

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

*reviewing huge PR in the morning

Me: What is worse than a PR with 71 file changes

Friend: A PR with 89 file changes that has 20 merge conflict

Me: fair enough

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

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

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

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.

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.

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

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.

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

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.

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

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

......please 😭

$ 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

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

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

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 😖

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

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

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

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.

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

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

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

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

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

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

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.

99 problems but a conflict ain't one

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?

Pro of not using Git

* No git conflict

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.

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.

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?

"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

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

A good day is when you rebase large number of files and don't get any conflicts

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.

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

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

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

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 😨

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

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.

Whoever has the audacity to push a commit with the message "WIP" should be made to fix every single merge conflict.

If I had my way I would have the remote not only reject the push but revoke write access for that user so they have to come to me and explain why they thought it was acceptable and beg for forgiveness.

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)

O can't convince my teammate that his .idea (project structure folder for IntilliJ IDE projects) doesn't belong on the repository.

He can't be bothered to make a .gitignore 🙂 he says that he tested and it doesn't cause much problems.

Well it causes problems for me because I use the same IDE amd it causes problems.

Cant even git pull without a conflict.

Me: you should only put source files in the repository, all these other files all should be local and cause problems for other people!

Him: nah dude just click import project.

Result: shoddy repo with no git ignore.

Damn if he wasn't my friend...

I hate working in a team in college.

Merge conflict in xcodeproj. Noooooooooo 😭😭😭

!rant

Some serious conflict right here

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.

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.

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!

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.

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

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*

I hate having to learn stuff for school while actually wanting to learn other things instead. Last semester I preferred the latter, but that got me a bad math grade, which in turn means that I have to actually study for mathematics for the first time in my life in order not to fail the whole year because of one grade.

So I have to delay learning Golang and trying out the Spring framework.
Goddamn it.

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.

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

Sample Merge Conflict 🤣

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

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.

Thanks for nice conflict detection !

I always feel python3 and pip3 are enemy of pip and python. My Mac always is in conflict of each other... Its feels like they are trying to prove each other

When you try to merge branches :D

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

OfferZen gives the best swag for developers in South Africa!

* 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

How to deal with merge-conflicts:

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

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.

If you ever wondered how to write a really bad commit message, here are some of my colleague's...

1. -
2. fixed conflict
3. initail push
4. css fix
5. amends to css
6. footer

And then a ton more hyphens. I wouldn't care as much if the code he wrote actually worked. But when it's down to his colleague's to fix his god awful code, it makes it a tad annoying trying to trawl through useless commit messages trying to find where he dun goofed. /rant

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.

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.

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

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

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.

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

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

merge conflict on release

"web developer" 😂👌

Solving merge conflict on version control takes too much time, so let's allow only guy to check-in and everyone else work offline keeping several old style working copy with (hell) numbers of backup. Once done everyone sends files to check-in guy.

I finally got my stickers. I feel like I have transcended existence. Or maybe successfully cleared a merge conflict! 😂

¿Does it really takes that long to merge a branch when there is a conflict?

My "PM" takes like 20 minutes to fucking merge a branch that has a few lines of conflict... and I fucking hate to wait so long to continue on a ticket where I need previous work... I'm a JR full stack developer and I'm new to devRant... It was love at first sight.

The project that I'm assigned to was developed in haste because of some competition with other vendors.

The Devs who worked on the original code didn't really follow each others spacing conventions. So now there are files which differ in spacing. A lot. And I'm used to the standard 8 spaces=1 tab convention.

Every frikkin time I have to even look at the code, I have to refactor it (but not save it) and then undo the refactoring because when I try to check in the refactored code, every line shows a conflict.

Every line.

So if I have to work with code which was written by more than one person, my life's a living hell.

Ctrl+Shift+F people! Use it or lose it!

How do I resolve this conflict of interest?

TLDR: I want to go out for exercise/health. But I also need an immediate goal. So when I go out, I will always end up buying some junk food.

----

It's such a nice day today. Let's go for a walk, get out the house and some exercise because I also love deals.

Hmm… where should I go? (Need a motivation)

I know let's go shopping! (Only reason to leave the house)

Takes a walk to Duane Reade (supermarket) 10 mins away.

It’s so hot/I want a reward!  I'm out already why not get a treat… let's see I can get a large Iced Coffee for $1 (or some other deal) at McDonalds (which is pretty much next door now that I'm here).

I mean isn't that a great deal! I could make coffee myself but only the KCup and well they wouldn't be cold. I want it cold now, not in an hour… (i probably won't when want it then). So that dollar is just for the coldness mostly and i guess the service cost.

Also since I'm here already, i save the food delivery fees (this also applies whenever I order for pickup: I save so much on the delivery costs and I get exercise too!)

Healthwise and financially, this negates any benefit of going out and probably would've been better had I not gone out and just ate the plain salad at home.

!rant

So got into a small debate (actually a civil one, surprise surprise) about the final project for a class. Basically the final project involves a team of 3-4 coders making a website for an actual client that either they find or provided by the professor.
The exact point of conflict was that the work is pro bono. The student argued that the work should be paid since after all, real work, real client. My argument is that because the clients don’t exactly choose the designers (or have little to no knowledge of most of their work) there will be high variance in quality and contract work would cause more conflict if done in class.

So just wondering, what do people think about this? Logistical issues aside (earning money for technically school property/ownership and money for learning essentially)

Any devs here from Canada or who have worked there?... know any?

I'm strongly considering immigrating to Canada to give my future family a better chance at life (My current country has a highly unstable political climate).

Just wondering how the dev lifestyle is living there (for the average dev) i.e.

- Quality of life - I know I can't buy a house, but what can I rent? A house/ flat/ box?
- Hows the dev scene / culture?
- Work life balance / Work environment frustrations (I hear they are very politically correct and this may be a conflict with my blunt nature)
- Income Tax vs Government service delivery, I expect tax will be high due to free health care/ education but are they worth it? nb; any service delivery beats what I get...

Any feedback is welcome and will be appreciated.

Not a dev question but a cultural question for any of the German devs I’ve seen post here.

My American daughter is living in Germany on an exchange student program. She’s frustrated right now because her host dad and host brother are being really rude and impatient with her over her difficulties with speaking the language. She currently writes it better than she speaks but that and her efforts to keep trying don’t seem to matter to them. This conflict spills over into other social interactions. They constantly berate and make fun of her over everything. The host mom and host sister are nicer and more patient. But they also have to put up with this boorish behavior from the males.

On a train ride home, my daughter was sexually propositioned no less than three times in one hour by three different men. And at festivals she went to where there was lots of drinking, it was even worse.

A German exchange student we once had living with us here in the US regularly broke program rules, slept around, and even downloaded child porn on our network (highly illegal and alarming). My wife was the coordinator for many years to govern the students who came here from many countries and we struggle to think of any but one or two German boys who acted like gentlemen toward ladies.

So is it just a “German guy” thing and commonly accepted in the culture? Or is this type of behavior generally frowned upon and these guys are just in a minority of jerks that we keep having the bad luck of running into?

I know the same question can be and is often asked about American men, too. But I’m more interested in knowing how Germans view Germans who act this way.

I started the job I'm currently at some months ago, and since then I've been pretty shitty. There are some days where I feel less shitty, I feel like I accomplished something, but at the end of the day, it feels shitty.

I had been here previously, and my gut had told me since then to quit, and it did the same again since I started working here again. I'm afraid I'm losing my time here, time that could be precious doing something else that would mean more to me.

They didn't keep up with some parts of the contract, I'm receiving pretty much nothing since I'm in a non-existent "formation", it's overall a whole load of crap.

I was supposed to do some stuff with Python, but then they told me to focus on Java and do some stuff after I was trying to learn (by myself) Python for a month, then they told me to do stuff with another completely different language again. WTF? I felt like I was shit.
Even in the last time I was working here, I was feeling the same, people were asking me to do webpages and other web things and then discarded them (literally) after I worked on them for weeks or they asked me to remake them COMPLETELY.
I had also been promised money for some side-jobs like doing websites for their friends, but in total I've received like 2/6 of what I was supposed to get.

Overall, I feel like my experience here has been shit, but I'm scared I won't find another job for these next 6 months (I'm taking a year off college to get some money)

If I follow my gut, my heart, and try to "fight" for my happiness, I'm leaving
If I follow my brain, and possibly become even more sad and miserable, I'm staying.
Who's the strongest?

I know you might even say "it's just some months" but those months will make a complete difference when I look backwards at my journey. I believe we cannot waste any time in life being unhappy.

Why couldn't they keep all their promises, not take advantage of me paying me so low... I'm completely sure I would receive more money somewhere else.

Well, I guess this rant is about my employer and the conflict between my gut and my brain.
Why can't y'all be friends and be on the same page?

Other dev in my department thought it was okay to comment out the latest version of jquery lib that was used in the project and replace it with about 2 year old version to make his feature work. He did not informed anybody about this and today when build was tested, blame was on me because the feature i implemented does not work. I found issue was because of old jquery lib he put.

Funny thing is, his feature does not work with latest jquery version.

I guess it's gotta be either me or him.

Wouldn't, it be amazing if we could have smart merges that understand the basics of the laguage you are using, and umderstands changes like moving a function, and helps by giving suggestions on what could be done to fix the conflict?

Today a merge deleted a bunch of code I had pushed in different branch. How the fuck did that happen? No conflict nothing! How can git delete something like this?!

<long post>

To start of I'm a student in the Netherlands, I have just finished finished a support management study and I'm currently starting with a IT Management study on MBO 4 lvl.

At the moment I'm in conflict scout doing the IT Management study or doing a application development study as I just don't know what to do. I kind of want do development as I do it in my free time and I like it but I also want to do data center engineering as I also like to work with the hardware.

Should I take a month break of my study and try to get in contact with company's to work there to finalize my decision or should I just drop in the towel and do this study without knowing if I'm going to like it in the end.

And if you work at a company in the Netherlands do you think i can do some orientation internship at your company or do you guys know some places to look at.
</Long post>

Not dev related so don't shoot me. If you like writing I figure you maybe might enjoy this and thought I'd share.

This is a section from an unfinished novel about 2050s America, set in a corporate subsidized mega-fevela sprawling across washington state, ruled by gangs and patrolled by the officers of a bankrupt nation suffering through austerity and on-and-off again spasms of mass civil conflict.

"Averice - Sex, drugs, and vice, in the downfall and dying days of america."

we lived in a smoke government, where everything was bullshit they blew up your ass so you could continue make believe while
you were bent over with your head in the hole in the ground you mistook for your ass to start with. And if you questioned it all, one bit, the mouth organ of the state would command
hate upon you, like an old latin curse, with a lexicon armada of phrases like "terrorist", and "troubled individual" to character assassinate you by drowning you in the humbling river of societies mass delusion giver, those two sweet letters "TV."

No, we were on the industry edge here, inventing better bait to catch what the state politiburo labelled 'bandits', all for what?

It had, in later years become fashionable to call those who didn't want to be stolen from any more, projected as it were, "thieves", in the same fashion as those in the middle east, defending
their homeland from foreigners, were labelled "insurgents." Tyranny had not so long ago grown a sense of irony it would seem.

And if you became enemy number one of the state, as thousands were, you would spend your days on the run, always looking over your
shoulder for the states vanish vans--black escalades with men in dark suits and mirrored glasses, like bugmen with shiny inhuman, and inscrutable eyes full of alien malice.

These were sordid summers, full of plastic playhouses where the cost of a days wages you could lay with a synthetic lover and pay away the days tense tax for a good lay, and forget your toils and troubles. And so many were kept in poverty because of easy habit and routine that they forget they were not living.

But for me, I had none of it. I preferred the troubled thing on the corner when I could coax one into my state issued sedan. She was sulky, with bright blonde curls, 19, maybe 20, with empty eyes, as if watching some invisible horizon. And in the glow of the blue neon, among the wet sidewalks, and trash, she leaned into my car. No words were exchanged. I nodded, and
she got into the car, a miniskirt, and slinky little handbag.

This was no more than state business with a bureau guy like me, and for her, little more than the prison trade taken public.

She huffed some powder and climbed spraddle leg onto my lap, grabbing me along my jawline, eyes locked onto the depths of my soul, and
for the next ten minutes as she moved on top of me, I was motionless property while my lusts became animal, and she, my cream cup.

After, I arrested her to the standard protests, but she new the game and quickly hushed. This was the verdant arithmetic of the state. I was awarded x amount of pension points for every criminal, no matter how, and it was no gentle hand, not the judge, not the jury, or the executioner of their will. It was the rigid touch of a long arm, dislocated from the law, and now, like frankenstein's monster, cobbled onto the mechanism of the state not unlike the manner of a combine harvester.

We were the owners of all by virtue of all we could take, and we took all we could get. The serial romeos of state police power, romancing
the unwilling citizenry with televised patriotism and five minute power talks at the beginning of the corporate day.

It could be paradise or a wasteland if we wanted it to be. And for a time it was.

Edit: devrant always breaks my formatting. sigh.

SharePoint have something called 'event receiver'. An event is triggered when the user inserts a new record in a list. That event must update a column in the same item. After a few minutes it starts to throw conflict errors while trying to update said column. Doesn't happen with every user. Also I wasn't able to reproduce this behavior in the dev environment.

So now I just recursively call the update method, passing an iterator parameter, repeating the same method until it successfully update the record. Or after 6 failures email someone to see what's going on. Just did it today and published at 7PM. Tomorrow gonna be a long day and I know I deserve it.

I just have one fellow programmer at work...
He actually managed to create a merge conflict on his own, because he worked on two branches simultaneously, and then assigned me to resolve it, even though I worked on a whole other part at that moment and have no idea which parts he wants to stay and which to be discarded! Take care of your own shit for god's sake!!

so...if you make a linux fone (android, duh) you have to release kernel source right?

but most fones you can't frickin root, unlock bootloader, and what not. thus, making that source kinda useless unless maybe you port it to another device.

so like...how is that even legit? not beneficial to most ppl. ffs. kool you obeyed GPL but can't really apply that code.

frickin stupid. pissed. just venting and bitching bc i want root on a fone w/ the io i want.

i know you can get "root" for a shell, but not sure what all would work for that. guessing it'd still block some things going through to the actual fone env. and that doesn't cover kernel modules, especially ones that conflict with what's running.

Git Merge 1 of branch to master: COMPLETE
Git Merge 2 of branch to master: (code change on branch, no change to master, exactly the same conditions, command, and procedure as before) FAILED - CONFLICT

Guess I’ll just die?

New feature request that could be unecessary by client just sticking to one of 4 different very similar input formats instead of many off the cuff formats, that conflict and i cant guess let alone a computer. But i present an outline idea of the solution with his specs

I didnt complain just told him what needs to change and what our constraints will be how the info is interpretted etc

Client says "dont spend time on code for that feature.. stick to other original work for now" ! omg hes getting it! Sweet. I only wasted an hour this time, and if he does want the feature, we have an agreed spec for it. We can get back to handling the customer level shit and maybe he can make some more money finally.

Scope creep plus 0, me plus one. Scope creep still in thr lead by a lot. Oh well. Still, this guy is getting more tolerable

Just spent two whole work days fixing a single merge conflict...
sanity--

The jurrasic - the one who only know vb6, giving us photo copied source code to study(on our own) instead of teaching it himself. Exam? Well fuck it he just hand us a photocopy of codes that we have to convert to digital and compile. I dont know how he grade us either.

The forgetful - she give us new activities every period..I can't count how many times she said "lets continue next day" and the number of folders of our unfinished activities in my classroom pc.

The good one - yes finally we have one only to be replaced by the jurrasic due to some conflict.

Why so many weird frameworks and libraries? these days I study so many frameworks and install things and I am actually overwhelmed. Sometimes those things conflict each other and end up messing up my PC. Do frameworks and libraries make dev environment fancy? I am not sure, to me it seems that things are going messy. Please give me fresh perspective.

Merge conflicts. Still have no idea where they're coming from.

So last year I was working for this company and worked there for about 13 months. I was hired as a web dev but was soon moved on to creating web banners in html5 so that a friend who was doing that before could focus on design for prints. Well few days ago that friend called and said he was going on a vacation and was wondering if I would like to come back an fill in for him while he is on vacation.

Since the company can't find anyone willing or that did that job before and nows all the specs like I do I was their only choice for the job (yaay me). Of course I accepted the position as it wouldn't require me to be in their office from 9-5 but only on certain days when banners need to be created and for few hours only.

The downside of this is it will last for a whole month (didn't expect that) and it poses a chance to conflict with my current job. But my current boss is ok with me doing this as long as my "day job" doesn't get affected.

So now that I know I'm their only choice for the position and they don't have time to look for someone else and train them as the friend already left for vacation.

What do you guys think, how much should I charge them for this work ?

They are still waiting for my quote on the price.

I'm thinking of a fixed price for 1 month of work and somewhere around 600€ minimum.

My salary while working for that company full time was 400€ and I did web dev + banners (static and dynamic).

On a side note:
I heard from a few friends who still work there, that they might offer me full time job there again. But that is a whole new rant for another time

Recently i switched from using git with gui tools to just console, and love the speed and reliability increase, but guys do you really resolve merge conflicts in console? Is it effective/worth getting used to?

So, I still hate the de facto two spaces standard in javascript. But I guess I have to compromise. At some point I should also write code for fellow human.

The trick to make it still readable is: don't write more than 3 level deeps branch/loop. It is okay for live coding in the class, it's not okay to put it on github....