|
Good afternoon to all.
I was wondering, is there a term for the person who's lumbered with the job of trying to merge code changes from one branch to another which hasn't been done in ages and has thousands of changes and conflicts and PAIN? On a bloody FRIDAY?
Tried resolving conflicts in .sln files? It's impossible, even for robots.
Regards,
Rob Philpott.
|
|
|
|
|
Rob Philpott wrote: is there a term for the person who's lumbered with the job of trying to merge code changes from one branch to another which hasn't been done in ages and has thousands of changes and conflicts and PAIN? On a bloody FRIDAY?
Elephanted. Stitched up like a kipper.
This space for rent
|
|
|
|
|
I would call him: late.
... such stuff as dreams are made on
|
|
|
|
|
Yep: "Sucker"
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
My choice as well. Thanks for being here.
Software Zen: delete this;
|
|
|
|
|
The intern? 
|
|
|
|
|
Welcome to the slow group. Been here for years.
Arguing with a woman is like reading the Software License Agreement. In the end, you ignore everything and click "I agree".
Anonymous
|
|
|
|
|
Rob Philpott wrote: is there a term
Job seeker.
There are two kinds of people in the world: those who can extrapolate from incomplete data.
There are only 10 types of people in the world, those who understand binary and those who don't.
|
|
|
|
|
|
Yes - "Fool" 
Marc
Latest Article - Create a Dockerized Python Fiddle Web App
Learning to code with python is like learning to swim with those little arm floaties. It gives you undeserved confidence and will eventually drown you. - DangerBunny
Artificial intelligence is the only remedy for natural stupidity. - CDP1802
|
|
|
|
|
"He who broke the last build"
|
|
|
|
|
|
Merge slave. 
Did you ever see history portrayed as an old man with a wise brow and pulseless heart, waging all things in the balance of reason?
Is not rather the genius of history like an eternal, imploring maiden, full of fire, with a burning heart and flaming soul, humanly warm and humanly beautiful?
--Zachris Topelius
Training a telescope on one’s own belly button will only reveal lint. You like that? You go right on staring at it. I prefer looking at galaxies.
-- Sarah Hoyt
|
|
|
|
|
Configuration Manager is the title I have heard when someone is dedicated full time to source control, continuous integration, and build management. Not slang per se, but something you might be able to put on a resume.
|
|
|
|
|
Condemned! 
|
|
|
|
|
I've solved this problem.
Step one, don't use a IDEs that need a file to track the files in the project - that's what the filesystem is for.
Step two, use git.
Step three, make everyone merge from master into their branch and get it working first.
Step four, obsessively peer review everyones work before letting them merge back into your precious pure master branch.
|
|
|
|
|
Rob Philpott wrote: Tried resolving conflicts in .sln files? It's impossible, even for robots.
Yes, very hard, but not impossible. It's specially hard because at least up to VS 2015, projects would have a number assigned like: 55, 56, 57. Then each project has a corresponding GUID, and all matching coccurs hrough this GUIDs, which of course are very hard to remember and update the correct references in the files.
Very painfull indeed, but there are ways around it, like completely ignoring the source branch sln changes, then re-include the projects in the solution after the merge.
To alcohol! The cause of, and solution to, all of life's problems - Homer Simpson
Our heads are round so our thoughts can change direction - Francis Picabia
|
|
|
|
|
It depends...
If (they are expected to do it correctly) Then "Sucker" Else "Intern";
Would you not just go back to the earliest set of changes and apply them one at a time?
Then the conflicts are local, and should be explainable?
I would not start this on a Friday... Ever... It sounds like a long job...
|
|
|
|
|
Run Driven Development: commit, push, run.
http://geek-and-poke.com/geekandpoke/2014/2/23/dev-cycle-friday-evening-edition
|
|
|
|
|
|
I was once that sucker left holding the bag in the Friday checkin nightmare. Then I got my MSCS and wrote my thesis on how compiling as we know it is broken and has been broken since Noam Chomsky's "Syntactic Structures" in 1957. Since then I have been developing a solution to that Friday checkin nightmare. I guess I'm still the sucker, but in a significantly more rewarding manner than moaning about a common computing predicament. Is there really no one else out there who has considered the problem as one that needs fixing?
|
|
|
|
|
Thank you so very much for restarting the computer sometime in the middle of the night. It took me only one and a half hour to find and open all that sourcecode and database stuff and hoped to get right to work when I came to work this morning.
Restoring the open documents after the restart did not work so well, huh? Which part of 'standby' did you not quite understand?
Ok, so it cost me one and a half hours time this morning to get everything back together again. I was informed that there are more important updates waiting. My response: Later. Only a little later I was then informed that there are important updates waiting. LATER, DAMN IT!
Obviously 'later' has a different meaning in Redmond, because only a few minutes after the second notice everything was closed and I was informed that we now finally get around to some updates. WHICH PART OF 'LATER' DID YOU NOT UNDERSTAND?
Only 90 minutes and a few restarts later and I can begin getting my stuff for the third time. This idiocy has cost me the entire morning. Yes I know you can do better, like the times when the important updates nuke the computer into the stone age.
Still, dear Mickeysoft, I would love to meet the primate who had that grand idea and shake his neck for a few minutes. This time it cost my boss' money. We shall see what happens when even Mickeysoft's free services cost more than he wants to pay. Meanwhile my Windows on the dying drive at home is still begging for mercy, but after this morning at 'work', I don't really think so.
Goodbye, Mickeysoft! Which part of 'die already' did you not understand?
The language is JavaScript. that of Mordor, which I will not utter here
This is Javascript. If you put big wheels and a racing stripe on a golf cart, it's still a f***ing golf cart.
"I don't know, extraterrestrial?"
"You mean like from space?"
"No, from Canada."
If software development were a circus, we would all be the clowns.
modified 16-Jun-17 7:32am.
|
|
|
|
|
When running a Windows PC you must alway be aware that it can reboot.
Having many unsaved files is never a good idea. What when a power failure occurs? 
Press F1 for help or google it.
Greetings from Germany
|
|
|
|
|
KarstenK wrote: What when a power failure occurs?
That's what a UPS is for!
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
Quote: That's what a UPS is for!
Valid point, but keep in mind the typical UPS battery life is around 30 minutes. Your work habits must take into account that a power failure duration can exceed your UPS's battery life, especially at night when you're not around to take appropriate actions.
Get me coffee and no one gets hurt!
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
