When a traffic light has a merge conflict.

Merge conflict in git

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

Git commit suicide

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

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

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

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

What your file looks like when it has merge conflicts:

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

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

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.

git-rebase-no-conflict

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

git push -f 😂

git merge conflict
😁😁😁

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

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

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

Unresolvable merge conflicts

Fun fact: Git conflict markers are valid Scala.

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

So yay.. I guess 🤔

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 😖

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

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

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.

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.

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

Pro of not using Git

* No git conflict

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

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

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

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

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

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

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

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

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

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.

!rant

Some serious conflict right here

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!

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?

How to deal with merge-conflicts:

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

When you try to merge branches :D

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

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.

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

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

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

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?

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.

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

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

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?

"fatal: detected dubious ownership in repository" - if git finds no conflict, it will always find other ways to cause trouble

Git merge conflict

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

That's the scariest moment

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?

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.

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

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.

Note: Do not work on projects off of cloud on multiple computers. You will most likely start losing code. As I did.

Was confident in my cloud setup until this happened, so began using git for projects that I actually care about.

Git conflict - use mine 😒

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?