|
Preface: I am learning Git (since some years  , very slowly) and English is not my native language. So, I don't know that what I believe about 'check-in' and 'check-out' is correct in English or not.
If I am in/on a Git branch, shouldn't it be called 'checked in branch' instead of 'checked out branch'?
If I 'checkout' (from) a branch then shouldn't it actually get me out of that branch?
And what is the command to 'get out from current branch'?
Is it possible that I am not in/on any Git branch?
|
|
|
|
|
I use Sourcetree, much easier using a UI 
|
|
|
|
|
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!
|
|
|
|
|
Except when you check out that book what happens is that the librarian creates an exact duplicate for you to borrow.
When you bring the book back the librarian then has to find the book on the shelf and duplicate all the crumpled pages, missing pages, dog ears and notes you have put in the margin of the page.
Woe betide should you have borrowed the same book at the same time as someone else and both added different notes to the same page or crumpled the same page in a different manner.
Now when you check the book in the librarian has to figure out whether your page crumple or that of the other person should be applied to the book being held in stock.
I feel sorry for librarians.
“That which can be asserted without evidence, can be dismissed without evidence.”
― Christopher Hitchens
|
|
|
|
|
GuyThiebaut wrote: I feel sorry for librarians.
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.”
― Christopher Hitchens
|
|
|
|
|
Yeah - but I was trying to reduce his confusion!
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!
|
|
|
|
|
OriginalGriff wrote: Getting the book is called "checking out", returning it is called "checking in".
Oh, I thought Git like checking-into the library (e.g. checking in hotel, airport) rather than getting a book from the library. A matter of different perspective.
OriginalGriff wrote: English can be a strange language, and you shouldn't take technical terms too literally!
English is certainly strange, especially to the people like me if(native_language != English || who_thinks_more_logically).
|
|
|
|
|
Shops (even online ones) use the same terminology: you "go to the checkout" to pay for your goods, and then leave or they are dispatched.
And if you think English is strange, don't even glance in the direction of Welsh!
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!
|
|
|
|
|
Nikunj_Bhatt wrote: And what is the command to 'get out from current branch'?
make a backup and :
format c:
This will clean git from your computer.
I'd rather be phishing!
|
|
|
|
|
format c:
sh: format: not found 
|
|
|
|
|
 Really, I am using Fedora!
|
|
|
|
|
Those Windows folks... Cannot even imagine there is a bright side in the world.
|
|
|
|
|
It's not you who checks in/out, it's the files.
I wanna be a eunuchs developer! Pass me a bread knife!
|
|
|
|
|
|
Haunting music. 
|
|
|
|
|
Amazing bassist thanks for posting
We can’t stop here, this is bat country - Hunter S Thompson RIP
|
|
|
|
|
pkfox wrote: Amazing bassist
Isn't she, though? More casual than Clapton.
And the drummer is absolutely spot on.
I wanna be a eunuchs developer! Pass me a bread knife!
|
|
|
|
|
Yeh, he can do complex and swing at the same time, which is always nice. Are those Meinl cymbals? They have that really nice look.
Explorans limites defectum
|
|
|
|
|
Dimples like golf balls. Ain't computer modelling grand!
(Computer modelling actually allowed people to make the first ever bell with an absolutely clear tone -- a couple of thousand years of people making bells, and it took a guy with a PC to make a perfect one, without ever being in the same room as a bell.)
I wanna be a eunuchs developer! Pass me a bread knife!
|
|
|
|
|
People who know what they're doing always make it look easy.
Pathetic little pop morons, who have everything done for them, have to pretend that it's hard.
I wanna be a eunuchs developer! Pass me a bread knife!
|
|
|
|
|
|
|
And I'm embarrassed to report that they are from Taiwan, not Japan as I originally said. I'm an uncultured American lout, what can I say?
Explorans limites defectum
|
|
|
|
|
My codebase, excluding binaries has now reached 600k of C# code.
I don't know how many people can appreciate how much code that is for one person.
I feel like I deserve a cookie or a sticker or something.
When I was growin' up, I was the smartest kid I knew. Maybe that was just because I didn't know that many kids. All I know is now I feel the opposite.
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
