The Lounge is rated Safe For Work. If you're about to post something inappropriate for a shared office environment, then don't post it. No ads, no abuse, and no programming questions. Trolling, (political, climate, religious or whatever) will result in your account being removed.
"I controlled my laughter and simple said "No,I am very busy,so I can't write any code for you". The moment they heard this all the smiling face turned into a sad looking face and one of them farted. So I had to leave the place as soon as possible." - Mr.Prakash One Fine Saturday. 24/04/2004
I was being a little naughty in not having an overly literal literal i.e "in a spin about planetoid" but I figured that people would know that it was likely to be a moon.
I was going to add a hint (as I'm on the road tomorrow) that the "plantoid" would have been "planet" a few years back as poor old Pluto has been demoted (rather unfairly to my mind but we'll save that particular hot topic for the Soapbox, where it belongs)!
Whenever you find yourself on the side of the majority, it is time to pause and reflect. - Mark Twain
It's like a library: you join the library, and they give you a membership ticket.
You want a book, you hand it and the ticket to the librarian and she records that you have it and you can take it away to read.
When you are finished, you return the book and she records against your ticket that you returned the book.
Getting the book is called "checking out", returning it is called "checking in". These terms have been used for hundreds - possibly thousands! - of years, and they refer to historical usage when the identity of the book was physically checked against the records and your library ticket.
When source control was invented, these terms were adopted for pretty much the same events: to get a copy of the code, you "checked out" the branch. When you are done modifying, you "checked in" your changes.
English can be a strange language, and you shouldn't take technical terms too literally!
Sent from my Amstrad PC 1640 Never throw anything away, Griff
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
AntiTwitter: @DalekDave is now a follower!
Been doing this = managing the main source code stream for several years in a team of more than 50 people. Never again. Librarian is highly interesting since you are the one knowing every single part of the code after some time, but resolving conflicts, in the code while merging and of course among the developers in the team, is exhausting.
You have my sympathy and respect.
Fortunately where I work we commit and merge our own changes, so we are personally responsible for resolving merge conflicts.
I can imagine that having to resolve other people's merge conflicts is no easy task.
“That which can be asserted without evidence, can be dismissed without evidence.”