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.

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?

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

What happens when two developers get married?
They merge

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

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

Took only 10-20 mins to resolve merge conflict

A group of programmers is called a merge conflict.

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

"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

What your file looks like when it has merge conflicts:

#Merge Conflict

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

Merge conflict

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

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

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.

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.

git merge conflict
😁😁😁

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?

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

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

Spent an hour sorting out a merge conflict...

... with myself.

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

Merge conflict

Unresolvable merge conflicts

me: sees a huge merge conflict

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

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

So yay.. I guess 🤔

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.

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

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?

$ 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

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.

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

......please 😭

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

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

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

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.

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?

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

Sample Merge Conflict 🤣

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

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?

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

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*

How to get a fast MR approval 101:
Tell the reviewers that you've had a trivial merge conflict due to other colleague adding unit tests in the same file as yourself, which causes the approvals in Gitlab to vanish.
They assume they had given the approval previously and just push the button.

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!

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

How to deal with merge-conflicts:

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

* 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

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

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

merge conflict on release

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.

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.

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

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

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?

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?

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

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

I need some help. I have a 1 months old MR in gitlab with 5 commits of a feature that I have to revert.

I have hard time understanding how to solve git revert conflicts and frankly this three windows GUI on intellij idea is very confusing to me. I am like afraid that I will accept a bad change or miss something.

Is there any other way to make this merge conflict solving easier? I was thinking maybe I could just rebase to head where I added my commits, revert them without conflicts and then rebase that branch on latest develop?

In that case I would be solving merge conflict by adding stuff instead of removing old stuff and being afraid that I will mess up something. Goal is to create a revert feature MR.

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

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

They should merge my pr first, so the one who will resolve the conflict is not me. I spent 3 days and nights cleaning 60 files in the projects. 60 files! Sadly, my manager merged other pr with 2 files changes from my junior first, destroying many of my changes.

Nothing like a friday night merge conflict hell because someone decided to deviate from git flow

Ok, let's put some repo on gitlab, create a new branch to make some awesome features, push a lot of commits over that branch. From the website make some changes, in same files, similar in the position of line of code, but in master, you remember your awesome work, let's. Make a merge, wait there's a conflict, let's solve this, you lost some lines of code after merge, ok let's try with rebase, oh lord, the same result, what to do, what would you do? I've not more ideas 😑

Your branch and 'origin/foo/bar' have diverged,
and have 2 and 1 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)

git pull
hint: You have divergent branches and need to specify how to reconcile them.

git merge origin foo/bar
Already up to date.

I used to be a developer like you, then I took a merge conflict to the master branch.

Pretty niche tool, but Sencha Architect!
It is a wanna be GUI-Builder/IDE for ExtJS, but neither works properly.
This rant is not about ExtJS, just about Sencha Architect, which my coworkers and I were forced to use.
If you want to join the ride, here an excerpt of just some of the issues:

- installation: already the setup is more of a gamble than an actual setup, either it works on your machine or it doesn't, plain and simple

- GUI Builder: just drag and dropping components is actually nice, but the editing capabilities are frustrating, you can't edit the UI code by hand at all, just through pre defined properties. If there was the need to really mix things up it wasn't possible, I couldn't even rebuild shown examples of their ExtJS documentation. Furthermore the property editor was data type locked, which means if you want to enter a string which ExtJS already supports, but architect locks the value as a boolean, you can't edit it at all, while still using Architect

- code editing: well it is a colored texteditor, which is fine, and I could live with that, but Architect let's you just edit areas where it allows you to - want to change something else? Nope not allowed

- autocompletion: there is none at all, same goes for refactoring, multi highlighting, string replacement, and others

- code storing: well now some may think edit it somewhere else, well no, also not possible... Architect not just only saves simple js, there is also a Json formatted file for everything you have created, which is needed so the tool can actually load it for further editing. They possibly never heard of DRY. But the worst of this code storing was actually using git along with it - have a merge conflict? Merge both files! Every single time, it was so damn tedious

There are a few more, but these were the worst I can remember.
Luckily I don't have to use it anymore!
Maybe they have fixed or changed a lot of it, because the developers were aware of the issues and eager to resolve them, as far as I was told on a roadmap presentation. And some of the tools they had released in the end of my time using ExtJS were actually really good, like an IDE plugin for the framework, and I liked using it.

What are good practices to avoid getting a merge conflict?

Question about scrum in terms of developer/QA workflow. We have a problem in our team: basically when a dev submits an MR it needs to get 2 approvals from devs and then task is marked ready for qa. Now problem here is that qa takes 2-3 weeks to get to the task and when they do usually MR has merge conflicts and since QA are quite new-ish they have to wait for dev for conflicts to be resolved, ergo rendering the MR unable to be tested until dev resolves the conflicts.

Our teamlead proposes to solve this by forcing devs to rebase everyday (even if QA will get to working on the task 3-4 weeks later). Problem with that approach is that each conflict resolve removes approvals. So I had a situation where in 3 weeks I rebased like 15 times and 5 times I had resolve coflicts and because approvals were lost I had to annoy all devs and ask for reapprovals. And this is only with 1 MR. Now imagine all devs doing rebasing daily and spamming each other for reapprovals. Its not efficient.

Anyone could advice how to solve this issue?

Can you imagine this scary moment while resolving conflict after a pull request that might break your code ?

That's the scariest moment

If I'm in a merge conflict and have the Diff Editor open (REMOTE, LOCAL) which file is the final copy that will be "saved"?

Had a new dev take us to merge conflict hell due to rebasing... we have meeting saying we are going to do git flow.....

manager who agreed makes branch project/releaseName based off of develop only to have us mr to that branch to then mr back to develop....

Had massive conflicts mr into that branch (i kept up to develop) and then had conflicts mr that branch to develop........ on a sunday night... great

Have a question about git rebase with android studio.

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

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

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

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

What I am doing wrong?

Git merge conflict

So yeah I'm currently working with a small team on a project that will save our company around 1000 FTE (literally ~1000 people) costs per year.

But we forgot to do branches in our gitlab project... And now I needed to resolve a merge conflict on a PyQT UI file. Fuck my morning I need more coffee!

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

GitHub: merge conflict in the readme document.
Me: I don’t care just skip it
GitHub: no go just use git to fix it
Me: I DONT WANT TO? CAN YOU JUST ADD SKIP IT OK

Weird git when i pull it does not conflict or anything just merge it with smiling face, then when i checked my repo, my work is gone. Whats wrong with this, anyone encountered this?

What's the moment when you type at god speed?

mine : during vcs commit and push*

*considering not to resolving merge conflict.