Join devRant
Do all the things like
++ or -- rants, post your own rants, comment on others' rants and build your customized dev avatar
Sign Up
Get a devDuck
Rubber duck debugging has never been so cute! Get your favorite coding language devDuck
Buy Now
-
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.6 -
I was showing my girlfriend how merge sort works... Halfway through my visual explanation, she took the pen from me and finished the algorithm.
I think I have chosen wisely :')9 -
- History teacher: The Spanish-Moro conflict lasted 400 years.
- Student: Why didn't they try a different merge tool?2 -
Thank you dear mr. boss for fucking up our master branch by adding local changes to a 2 months outdated master branch (250 FUCKING COMMITS BEHIND), pull the remote and then just push without resolving any conflicts!!!1!!!
But thank you so much for sending me an email at 10pm asking me to resolve the conflicts.
It is 3 in the morning and it took 1 hour to get it clean.
Sometimes I want to break some necks...9 -
Me after a large Git merge, after expecting masses of merge conflicts and getting none. Life is good my friend.
2 -
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. :|3 -
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 guys14 -
Successfully resolved my first merge conflict WITHOUT destroying the whole project.
#eleventh-time-lucky3 -
- Merging 300 files from one branch to another in TFS.
- No merge conflicts.
My first thought:
This can't be right. I must have done something wrong...3 -
"Before you marry someone, you should first give them a massive merge conflict to see who they really are."2
-
It triggers me when Mac users commit .DS_store file on GitHub.
Its even more annoying when they dont merge my PR which deletes the .DS_store file8 -
That moment when u created a project and quite some folks forked it and continued their own versions, but then you realised that you've made a little mistake back then so now your dumb code propagated across humanity.
¯\_( ͡° ͜ʖ ͡°)_/¯2 -
Teamate: Hey I'll checkout you're branch to see what you've got done today.
Me: ...Ok.
Few hours later Teammate forgets to change branch and overwrites all my code in my branch causing merge hell and creating hours of more work.
Me:...what in the f***?!
6 -
I just got my first commit merged in LineageOS. Feels good. It only took 1 month to merge it in but well they have looooot of work.10
-
Ahhhhhhhhhhhhh!!!!!!
A pull request I made to an actual open source project got merged. I might actually be a real dev now!
(It was just to remove a snippet config, but still!)8 -
"Read-only Friday" rule: On Fridays, you don't deploy new versions, don't merge code into production, don't update databases, and a lot of others "DON'Ts"4
-
Friends their dream world: Sun, beach, cool drinks, nice car.
My dream world: No merge conflicts, one standard for all platforms, dark themes for everything.
¯\_(ツ)_/¯2 -
I tell him to submit a pull request, he just merges his code. I revert it and tell him to submit a pull request, he submits one then merges it himself immediately after...6
-
I wish there is such thing as branch in a relationship. So that whenever a couple are having a fight, they can create a branch and work their shit out in that branch and eventually merge to the master branch.
Wait
Merge....
That just costs.... more conflicts3 -
I was made owner of the GitHub repo in my team.
I am the second guy with rights to merge to master.
Soo happy 😬7 -
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 (ಠ ͜ʖಠ)2
-
I just sent my first ever merge request to MESA.
It fixes a build issue. WOHOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO.
Haxk20 is excited as fuck.19 -
Ran couple of interviews today I don't think I'm ever gonna forget this guy: He was explaining a time he worked in a team and used version control. I asked how he handled merge conflicts his response:
'If there are merge conflicts I delete their work and use mine, my code is probably better anyway'.4 -
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?3 -
The moment when you made branch restrictions, but your colleagues just remove them so they are able to merge their branch into master.2
-
Am I the only person that deletes their github repo and then uploads it again when you encounter a merge conflict?15
-
When you're working on the same project and git branch with another intern and he decides to make copies of the files and rename them to avoid having to merge his code with yours. ._.4
-
From a buddy:
A friend's comment on the latest merge conflict on the integration branch:
"O brachName! my branchName! our fearful sprint is done,
The build has failed with every merge, the goal we sought not won,
The release is near, the worst I fear, would Product be exulting?" -
Don't know if this was posted, but that's not stopping me...this is from awhile back before I discovered devRant
1 -
When some one at the company decides to branch off from the main codebase and end up with several outdated and separetely modified branches for two years.
Yeah nice work genius and good luck with resolving over 250 files of merge conflicts.
Just kill me now 😭1 -
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 blood1 -
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 😖2
-
Git pre-commit check means that only team lead can merge to master. Team lead is also pulled in meetings all day everyday and so never has time to merge...1
-
Code review, intern style:
Intern: Here is my pull request ...
Colleague: I see a problem with x, y, z. Could cause memory leaks.
Intern: Oh yeah you are correct, i'll fix that in the next one.
Intern: *merged* -
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 :) -
hey dickhead, you could, at least, test everything is working after you merged your branch.Now you have leaving the company, i'm the one in charge of cleaning up your shit.
Hope you will eat a dick every time one of your program fail 'cause of your lack of test2 -
The backend people at my old company had 4 files which they all committed code to (they were about 10 people). The only reason they didn't use a single file, according to the lead developer, was that Eclipse could only handle 12k lines per file (or something like that).3
-
I just broke out of merge-hell.... It was a mere 2 and a half hours... But my migraine says it was eternity.... 😶
-
When your tech lead revokes everyones merge priviliges on Github because of an issue with "code disappearing from the repo" which he originally suggested was a bug in Github and we should call them for help.
-
I'm sorry, but I'm so fucking done with Hinglish.
I wish tutorials that merge the two have an indication of it in their titles.5 -
When you just merge master into development branch and whole Jenkins wall turns red. Wtf? Wasn't me bro.. o.O
-
Take your time with merge conflicts, and put the entire file in another editor in case you really mess up.3
-
INTELLIJ YOU PIECE OF SH*T, I CLICKED "SMART CHECKOUT" NOT MERGE 2 UNRELATED BRANCHES, SCREW UP MY MASTER AND DON'T LET ME RETURN UNTIL I FIX ALL MERGE CONFLICTS.5
-
When you offer to help out a fellow coworker on the top priority feature he is developing and he just sends you the branch and stops working on it.2
-
Ohhhhhh I have to update about 40 forked repos at github.
Ohhh I fucking hate to add remote merge and commit and push.
Ohhhhhhhhhhhhhhh -
That moment when the code doesn't compile due to an error in a different module that you never touched after merging the master branch into yours...1
-
Trying to resolve merge conflicts and you cant remember which changes are the ones you want to keep. Lesson learned, make sure your pull requests dont sit waiting for weeks while master is happily being worked on.2
-
The day we had to have an app ready for an upcoming demo. Management said everything needed to be done by the end of the day. My change was done, but was dependant on another change being merged first. I had been in the office since 8am. It didnt get merged until 5pm. I was in the office until 8pm trying to fix the insane merge conflicts. In the end i gave up and went home. The next day we discovered that the "deadline" was made up anyway so we still had time. I wanted to flip every single table in that office.1
-
That feeling when you have a messy merge, nothing works but don't give a shit and go home for the weekend, that's Monday guy's problem!
-
When you have a one-to-one relationship, do you merge the tables into one table or do you keep the two tables?8
-
Created a merge request for a big issue last week. Some dumbass co-workers merged several other stuff for tiny shit issues that lead to many merge conflicts now because they didn't pull before..
Nevermind.. will be merging develop into my branch for the third time now.. Got already 20h of extra work because no one minds to merge my request because it's so big and someone might have to check the commit messages what really happened..
Conflicts suck! Co-Workers suck! -
Being forced to rush code, then waiting for merge approval from your US based approver at 3am while they add comments to the review complaining variables aren't final.
-
Outlook - " You have many duplicated contacts. Want to merge ?"
Me - ( inside mind thinking .... wtf, there are no duplicate contacts ) Ok do it.
pressed 'merge' for every contact ( Yeah, 'merge all' wasnt even there. Fucker designed the application which ask user to merge every contact, one by one ).
End Result - Brain Fucking piece of shitty microsoft' outlook android application, created 5 duplicates of all the contacts. Cant be more happy. Now i have 1000 contacts.
Microshit at its best again
Microshit managed to keep my trust on its products. Always, performs like Tatti ( Shit in hindi )
Edit - A wise man honoured Microshit with 'Macroshit'1 -
Contributing on github projects.
Especially when my pull-requests finally merged to the original master ^^ -
!rant
I love gitlab but what's up with merge requests taking forever.
I'm not the waiting kind. Smash a keyboard or something.3 -
Vim is fun to learn. Now when I git merge I'll be in a familiar program instead of a hellish prison.
-
If you're having merge problems I feel bad for you son, you've got 99 problems but my branch ain't one!1
-
When managers ask you to complete some code in an hour and it takes them 5 hours to approve the merge.
-
Just fixing a broken build due to another bad merge by SVN. There was no reason it should have fucked that merge up but somehow it did.
Of course I didn't double check by building locally so that was my screwup but what I wouldn't give to use a decent source control tool1 -
Time spend with coding: 2 hours
Time spend with branching, merging, fixing merge mistakes and check if systemnis building again: 4 hours
What a miserable day... -
How to deal with merge-conflicts:
1. You don't
2. Just clone the whole repo anew again and start over dude -
trying to do a git merge by command line, because my coworker insists on developing directly on the staging server using ssh1
-
you don't know what true anger is until you have to manually merge a big assignment because your colleague made unreported changes ALL OVER YOUR GODDAMN FILES
-
Why do some developers rebase or resolve merge conflicts when you can just email each other changes and force push?4
-
!rant
Relationships are like github projects, you can push, merge, commit, have issues, etc. Just don't go open source....6 -
My coworker pushed changes to almost all of our ASP.NET pages. However, he did so by pushing only his files, and when asked to merge, he overwrote all of our changes to those pages since he last pulled from the server, which was ages ago. We were three changesets past that overwrite before we noticed things we'd already fixed were gone. Had to revert, which we didn't know how to do, and we didn't know what he changed in his push, because he didn't comment on the changeset. He undid weeks of work, thankfully we only lost a few days worth over we reverted. We're going to have a quick lesson on merging correctly on Monday when we all get back10
-
"No merge conflicts, ready to commit."
Such sweet words from TortoiseHg, and it's not even valentine's day! -
When you keep on refreshing the tab to see if your pull request got merged but it still says
”Pull requests 1”
3 -
Merging one git branch into another when it conflicts an added line or function.
Like really? You can't handle ONE LINE being added?6 -
> merging feature 20155
> Removing debug messages for previous commit
> Fixing bug from feature merge
> Fixing bug from previous fix
> Merge fml -
I finally got my stickers. I feel like I have transcended existence. Or maybe successfully cleared a merge conflict! 😂
-
Got through 4 hours of merge conflicts before pushing to prod... I imagine this is how doctors feel during an operation... #ef
-
That moment when you go to merge a branch and realize no one rebased for 3 weeks and your whole day will be merge conflicts...1
-
The dev behind me just send some code changes to another dev because those two dont want (or are just too stupid) to merge their code with git...2
-
Start managing my bank accounts like they are git repos:
* account checkout -b venture/Some_Startup
* account add .
* account commit -m "Profits and Investments"
* account merge origin master -
Sitting in a bar with a senior colleague (Me - Student part timer, Him - 15+ Years of experience).
We started talking about our projects and he mentioned that after this, he'd get to spend his evening fixing a git merge, which went wrong because one of his teammates used cherry pick and thus messed up the history a bit (oversimplified).
So he tells me he'd be spending hours to get an overview of his colleagues codes (multiple devs and only team leader knows who does what exactly).
So I suggested he revert these cherry picked commits and so could maybe solve the problem in less time.
He thought about it... Told me HE didn't think of that and thanked me for my help.
Long story short: Today was a good day :31 -
Pretty difficult to control bad rebasing so... merge for the win!!! #Git #developerproblems who is with me??
-
When you git pull and there are merge conflicts and you commit without resolving conflicts and you push 😂😂1
-
Wow! My rights to merge work is just revoked. This is fucking bullshit. Whenever i want to merge my work the project lead has to do it. And when he’s sick ill have to go to the fe lead, who is in meetings 24/7. Fucking great2
-
My heart was still full of excitement when my branch was merge in develop branch without any comment. 🤩🤩🤩
-
To branch or not to branch? (in developing software multiple features, releases...) (git)
I've been searching a lot of posts and info on the internet ( http://bit.ly/2kBLcar http://bit.ly/197szRP ). In summary, some people say it is better to branch and others the opposite. What do you think?
My conclusion was: let's branch but let's merge periodically to minimize merge conflicts.1 -
Algorithms class assignment..
"Prove that the merge procedure cannot run in place".
Searching google...
There are multiple merge procedures (though super complicated) that run in place.
What's the use of this class if we can't be practical because we must be theoretical, but we can't mention real theoretical stuff because it's so complicated??
I mean we are being told something that is just wrong..
I really hate this fucking professor. She went to Oxford and now thinks she's the smartest person in the universe..1 -
Today, a colleague requested a merge with 5 commits, but only 3 changes. He must be a wizard or an idiot.1
-
Today's the day I realized my branch was better off if I just restarted from master and cherry-pick the commits I liked from the old one. This is what I get for the branch hanging around so long.
Lesson of the day: Merge early, and merge often. -
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?3 -
Nothing like starting your Monday morning with a call from your senior developer saying that the merge went horribly.
-
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!!1 -
Coworker just showed me how he avoids merge conflicts and I'm undecided on it. We use feature-branch workflow, so if a feature takes a long time to finish, it may mean merging master multiple times. He avoids it by stashing changes instead of committing them, then when he needs to merge master into the branch it's still clean. When the feature is done and he's ready to commit, he pops the changes and git diff shows all the changes before you push and you just change what you need instead of being forced to use the horrible merge software.
There must be problems with this, right? This seems too easy for it not to be the standard.6 -
Same product repo, two projects, 2 tech leads and 4 pms. Each project is a race to merge for trunk so the other has to do it.
-
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?!3
-
You want to re-merge a branch after a previous merge has been reverted on the mainline branch?
That's easy! Just revert the revert commit and then merge again. Because logic. -
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?1
-
Waiting to merge the rest of the team’s new code because you don’t want to deal with migrating your test account to a new backend until your feature’s ready, finally finishing your feature (!) and then seeing 100+ merge conflicts and realizing you‘re better off just re-implementing all your feature code into a new branch, & deleting every trace of your old branch so nobody sees the 1000+ merged commit mess you’ve made -_- today was supposed to be easy...
WHY WOULD ANYONE NEED THREE DEPENDENT SUBMODULES ANYWAY?!?! 😩1 -
Management wanted all features finished by close of business yesterday to start testing before a demo next week.
I started work at 8am to get my task out of the way early. Unfortunately there was another persons task that mine was dependant on. I kept telling people it needed to be merged so i could integrate it with my changes.
It was merged at 5pm.
I was still fixing merge conflicts at 8pm. 😑1 -
I am fucking dumb, why I've created an empty project to implement the new feature instead of making a fucking local branch. Now I need to merge this shit manually. fuck fuck fuck5
-
When a junior developer forks new feature branch from his old feature branch and not from develop branch causing merge conflicts later!1
-
I just picked up a hobby project which I hadn't worked on in a while and started doing some major refactoring. However, I forgot to pull before I started and didn't realize that I made some updates on a different pc. Then as I wanted to push a ton of changes I noticed... I didn't even attempt to merge because it was one giant pile of shit conflicts - and I didn't remember what changes I had made earlier. So I decided to say fuck it and
$ git force --push
Feels *so* much better than pulling my hair out over conflicts :P2 -
The wonderful feeling when project was finally relesed and deployed, you have no chance for any more last minute fixes and you can finally merge into master and break everything :-)
-
The day you wanted to do something insignificant and you are stuck fixing merge issues .. I hate it i freaking hate it..
Lost an hour doing stupid bullshit merge issues.. -
Important merge request howto:
- Hey, I implemented very important server change and it doesn't break compatibility with current clients!
- Cool, but we don't need this compatibility code. We'll adopt our clients as soon as the merge request is accepted.
- Ok, I removed support of current clients.
- Cool, but it's too dangerous to adopt our clients rights now. We'll accept your merge request later. Some other day... somewhere... some other time... -
One thing I absolutely hate is resolving merge conflicts but if Git wouldn't have been there, I would have not liked that..
-
Why watermark wouldn't merge when image is uploading? This situation is have risk for content theft @dfox5
-
Humpty Dumpty had a bad merge ...
All the team's horses and all the team's men couldn't merge the code back together again. -
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"?2
-
"dont bother with unit tests we dont have budget for those" - still paying the price for naively following that one, every svn merge is a bastard now1
-
getting tons of fucking merge conflicts on rebasing remote branch with current master because that mockerfucking code review is still pending
-
How come when implementing merge sort the mid doesn't need to deal with odd/even division?
I know int will always go down if there is decimal but how will it cover the whole array?
Full code:
https://gist.github.com/allanx2000/...
I guess in general, array indexing that involves dynamic cutoffs always confuse me.
How do you think about them without having to try things out on paper?7 -
Finish the story and all tests pass
*notification another merge request been approved
Pull changes build, all tests faill
-
I was very interested with the concept of programming and so I downloaded varies IDE's one of which was Android studio, I didn't have interest in it at first but one day I was bored and decided to open Android studio and play around placing varies components making a very uninteractive app and the feeling I got was unexplainable and I knew that this was going to be my passion.1
-
JavaScript query:- I have number of sound clip on server. Which user can create different mixer sound by combination or by merge. How can I save the output merge sound by JavaScript or php in user local desktops or mobile.
-
TFW your collegues rename and refactor everything, don't comment on their commits and then break EVERYTHING when you merge their changes into your branch. FFS.
-
Used a GUI to merge branches today. I managed to create a local branch with the same name. Merge my changes into that. Then merge my local into the remote of the same name. The network graph is a little crazy right now.
-
Just rebase a merge conflicts with LFS enable. What a fucking nightmare. And bitbucket, please eat a dick you useless cunt.
-
When they hits the sign where everyone knows they should split the core and refactor their API, Apollo chose to merge everything.
Great engineering management there. -
What's the moment when you type at god speed?
mine : during vcs commit and push*
*considering not to resolving merge conflict.1 -
Merging two months of work from one SVN branch to another without touching the trunk. I now know what the 16th level of hell is.1
-
Was playing Alchemy 2 and tried to merge Engineer and life but it didn't allowed. Looks like even in game engineers are not allowed to have a life. :(
-
Completely noob question and before you say it, yes I have googled but I'm tired and I just get walls of text.
How do I merge a pull request?
A nice guy has submitted a pull request to my repository on GitHub, how can I merge it??
I tried what I thought was merging but it said that a file is conflicting. I tried deleting the file and it still didn't merge.
4 -
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?
Top Tags
Weekly Rant
View