|
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!
|
|
|
|
|
I have a computer that can run for months on four AA cells from the supermarket. Next year it's going to be 40 years old and worked fine all the time, even with a 256 byte ROM instead of a OS.
I can live with losing everything when the power fails. It was just a collection of source code and data for the operation I planned for this morning. It's not a tragedy when the power is out and everything is lost. It's just an inconvenience.
What really bothers me so much is that Windows went out of its way to create that inconvenience twice. There was no emergency of any kind and asking twice and then doing it anyway when it did not like my response is not acceptable. This could have waited until I go home. Then it would have had the entire weekend to restart the computer as often as it wants. As a bonus, I would not have been held up the entire morning.
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.
|
|
|
|
|
KarstenK wrote: When running a Windows PC you must alway be aware that it can reboot. First in standby, then after telling it twice that it can wait until I go home?
Please remind me to tell a surgeon not to let any Windows devices near me if I ever need surgery. Honestly, unless your fan has died and the CPU is going up in flames, nothing is so important that an immediate shutdown is required. Indeed, the CPU would simply swich off (Intel) or burn (AMD) in that case and not wait for the OS to shut down.
Any updates are certainly not so important that they would warrant getting on my nerves like that.
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.
|
|
|
|
|
Look on the bright side, now the updates are done you're safe for another week
Sin tack
the any key okay
|
|
|
|
|
Hi,
Sounds like you did not setup your device restart policy.
Manage device restarts after updates[^]
If you are on the Home edition of Windows 10 and do not have the group policy editor then you may want to consider upgrading to Pro.
Best Wishes,
-David Delaune
|
|
|
|
|
Randor wrote: If you are on the Home edition of Windows 10 and do not have the group policy editor then you may want to consider upgrading to Pro. Oh, I'm at work and this is Win 10 Pro, installed over the MSDN subscription. This my boss has to deal with.
At home I'm about to upgrade to Ubuntu. At the moment my system drive is on its way to Valhalla and when it dies, Windows leaves with it. And then I finally get to write real C++ code again.
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.
|
|
|
|
|
You could hurry it along by accidentally dropping a sledgehammer on it...
#SupportHeForShe
Government can give you nothing but what it takes from somebody else. A government big enough to give you everything you want is big enough to take everything you've got, including your freedom.-Ezra Taft Benson
You must accept 1 of 2 basic premises: Either we are alone in the universe or we are not alone. Either way, the implications are staggering!-Wernher von Braun
|
|
|
|
|
Or just rip out the drive.
By the way, that one photograph of the helicopter was just great. Up to now I had only a drawing, which I compared to the photo. The only info about the drawing was that it was from a Bell 204, which might be a UH-1A, UH-1B, UH-1C, a UH-1E and even some more. The one on the photo must be a UH-1E (because this one was exclusively for the Marines) and the picture nicely shows all kinds of details on the underside which exactly match the drawing.
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.
|
|
|
|
|
Sounds like such a great idea!
Screw people who use your software and give them a tad of relief IF they purchase an update that they really didn't need . . . except, of course, to protect themselves from the software!
Ravings en masse^ |
---|
"The difference between genius and stupidity is that genius has its limits." - Albert Einstein | "If you are searching for perfection in others, then you seek disappointment. If you are seek perfection in yourself, then you will find failure." - Balboos HaGadol Mar 2010 |
|
|
|
|
|
CDP1802 wrote: die already
Later.
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
|
|
|
|
|
That would have triggered about the same reaction as some lowly private who once turned around, put his hands into the pockets and said "Yeah, whatever you say."
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.
|
|
|
|
|
CDP1802 wrote: Which part of 'die already'
I hope they don't die. I make my living using their software.
However, I do understand your pain.
modified 16-Jun-17 7:57am.
|
|
|
|
|
For the moment it's ok if just the hard disk dies and takes Windows with it. As to making money: No doubt someone else will sooner or later fill the gap if they disappeared. Picking a side in the succession wars to fill a vacant throne could actually be interesting.
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.
|
|
|
|
|