Technical slang term
-
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.
-
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; -
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.
Condemned! X|
-
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.
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.
-
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:
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
-
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.
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...
-
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.
Run Driven Development: commit, push, run. http://geek-and-poke.com/geekandpoke/2014/2/23/dev-cycle-friday-evening-edition
-
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.
Nightmare
-
Nightmare
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?
-
Ayyy lmao
