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.14 -
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 guys13 -
- 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 -
Successfully resolved my first merge conflict WITHOUT destroying the whole project.
#eleventh-time-lucky3 -
"Before you marry someone, you should first give them a massive merge conflict to see who they really are."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 -
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 -
"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
-
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!)7 -
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 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
-
Generally I repeat to my team: "if you touch master I'll cut you f*cking hands off!". Even when I have master push policies.
Should I be extremist about master?16 -
```
Your branch is behind 'origin/master' by 562 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
```
`$ git pull`
```
251 files changed, 103274 insertions(+), 1361 deletions(-)
```
okay fuck.11 -
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?2 -
How the hell does PR containing production secrets and private keys gets 3 approvals and gets merged upstream? 😬 🥴6
-
My manager thinks I am Superman! and he is so confident that can do any shit he wants me to do.
Yesterday he asked me to merge an ancient code hotfix (literally ancient) with latest branch of changes.
1. Hotfix is really old, most of the things are hardcoded, very specific to a stone age client.
2. Code documentation does not exist.
3. Developers of that code are probably dead.
4. Many Libraries which code uses are deprecated.
5. It's a legacy code, so no one has fucking idea what a particular clumsy block of code do, or what will happen if you remove it.
'if it runs don't touch it' policy by management.
Despite all this shit I successfully merged the the hotfix, refactored outdated code so as to run the application.
Showed this to my manager in full swag!
He was surprised at first, and asked me to show the code changes.
'Code review' was done by comparing files 😅
Manager: Dude, you have changed these lines, why? Explain.😧
Me: those lines won't work with new build, with new libs.☺️
Manager: then why can't you do old build with new changes?🙄
Me: umm.. wait... what???🤔
Manager: the code was working previously, it must be working even today without these changes.😡
Me: it was not working hence I made changes and now it's working fine see! ☺️
Manager: you have removed this, this and this!!! 😡
Me: but I also added that, that and that!😔
Manager: "don't touch it' if it works!"😡
Me: ... Idk what to say!
(In the back of my mind: "Don't touch it even it doesn't works!")😌9 -
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
-
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 -
Dear God please if you help me fix this merge conflict, I'll be a better person.....please
......please 😭11 -
Don't know if this was posted, but that's not stopping me...this is from awhile back before I discovered devRant
1 -
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
-
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 -
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
-
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
-
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 -
Doesn't matter how many years I do this job, a merge conflict will always stop my heart for a good few seconds.7
-
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 :) -
I just broke out of merge-hell.... It was a mere 2 and a half hours... But my migraine says it was eternity.... 😶
-
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 just merge master into development branch and whole Jenkins wall turns red. Wtf? Wasn't me bro.. o.O
-
Deploying on stage.
Testing on stage.
Why does the issue persist on stage?
Testing on local. It is fixed!
Wtf?
Wtf!?
WTF???
Oh.
I did not merge my branch and deployed a new version on stage without any changes 🤦
It's Friday. I should go home.2 -
Take your time with merge conflicts, and put the entire file in another editor in case you really mess up.2
-
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
-
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.
-
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
-
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
-
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
-
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.
-
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!
-
Dev: can you please merge this to master?
DevOps: ok
Dev: thx
QA: wait... Who tested this?
Dev: oh it works, it was tested...
QA: by qa?
Dev: ... <Dev2> tested (sitting right next to him)
QA: ...amIAJokeToYou.jpg6 -
When managers ask you to complete some code in an hour and it takes them 5 hours to approve the merge.
-
!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 -
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! -
If you're having merge problems I feel bad for you son, you've got 99 problems but my branch ain't one!1
-
Contributing on github projects.
Especially when my pull-requests finally merged to the original master ^^ -
Vim is fun to learn. Now when I git merge I'll be in a familiar program instead of a hellish prison.
-
Some things never change
> Have to deploy only one feature to production
> Create branch from latest tag, cherry pick the correct changes
> Mess up merge
> Almost deploy resulting broken code to production
> Realize at last moment
> Let out a loud sigh, start over
Every damn time.4 -
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... -
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
-
"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 -
trying to do a git merge by command line, because my coworker insists on developing directly on the staging server using ssh1
-
How to deal with merge-conflicts:
1. You don't
2. Just clone the whole repo anew again and start over dude -
My Cat-magnets make me smile every time I look at them!
OfferZen gives the best swag for developers in South Africa!
1 -
!rant
Relationships are like github projects, you can push, merge, commit, have issues, etc. Just don't go open source....6 -
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
-
Why do some developers rebase or resolve merge conflicts when you can just email each other changes and force push?4
-
> merging feature 20155
> Removing debug messages for previous commit
> Fixing bug from feature merge
> Fixing bug from previous fix
> Merge fml -
By Boss insists to do branch merge in a Skype meeting after work time.. he has nothing to do with development but he insists to be with us and lead the procedure..
He thinks this is how Devops works..2 -
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
-
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 -
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 -
Pretty difficult to control bad rebasing so... merge for the win!!! #Git #developerproblems who is with me??
-
Got through 4 hours of merge conflicts before pushing to prod... I imagine this is how doctors feel during an operation... #ef
-
Today, a colleague requested a merge with 5 commits, but only 3 changes. He must be a wizard or an idiot.1
-
My heart was still full of excitement when my branch was merge in develop branch without any comment. 🤩🤩🤩
-
I finally got my stickers. I feel like I have transcended existence. Or maybe successfully cleared a merge conflict! 😂
-
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 -
When you git pull and there are merge conflicts and you commit without resolving conflicts and you push 😂😂1
-
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
-
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 -
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 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!! -
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 -
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
-
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
-
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. -
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..
-
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 :-)
-
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 -
Nothing like starting your Monday morning with a call from your senior developer saying that the merge went horribly.
-
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.. -
Git Question:
Semiunusual state here. Have a branch I'm trying to merge into develop and there are a LOT of merge conflicts, some head way has been made in this merge branch..
HOWEVER
I'm wondering is there a way to "suspend" the branch/merge progress and go back to develop?10 -
getting tons of fucking merge conflicts on rebasing remote branch with current master because that mockerfucking code review is still pending
-
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. -
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
-
Finish the story and all tests pass
*notification another merge request been approved
Pull changes build, all tests faill
-
Can you imagine this scary moment while resolving conflict after a pull request that might break your code ?
That's the scariest moment1 -
Why watermark wouldn't merge when image is uploading? This situation is have risk for content theft @dfox5
-
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.
-
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 -
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.
-
I use GitKraken to only to resolve merge conflicts. Recently, they decided to make app unavailable for private repos.
Suggestions?3 -
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 -
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
-
Just rebase a merge conflicts with LFS enable. What a fucking nightmare. And bitbucket, please eat a dick you useless cunt.
-
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