In a Git repository, where do your files live?
That was very informative, but I wondered if there is an easy-to-read reference somewhere about WHY git works the way it does?I am old enough to have used SCCS, RCS and CVS extensively.  Each had their faults, but Git is the only VCS I have used where dealing with merge conflicts is unintuitive enough that I sometimes end up with the repository in an unusable state.  I am sure I am doing something wrong, but I would like to understand why.The VCS that maps closes to the way my brain works is ClearCase.  You essentially have a versioned file system, and you can set up a view to present any previous state of that file system.  Of course, administration is a nightmare, it is not distributed, it is expensive, yada, yada. But when using it I always felt I knew exactly what was going on under the covers, which is not the case with Git at all.