In git, when they talk about branches and draw those little diagrams with circles and lines to show branching, it is incredibly complex because git encourages branching.
When you do a commit on your local copy of the repo, it creates a new thing that is called a branch according to the way git thinks.
They draw pictures like this:
Each circle is what happens when there is a git commit and is called a branch.
In SVN its just a sequence of commits and they tend to be called versions or revisions. In SVN they have numbers (in sequence) but the branches are named with their own sequence of numbers.
In git, they also talk about the contents of a branch which seems to mean all the changes that comprise the branch.
Truth from a bit later: You have to create a branch. Well, somebody has to. You can just pull it down from some remote repo. Use "git checkout" to move between branches in a workspace. It's a "modal" thing. Then commits go to the curent branch you are in and pile up in there as you do commits. Or someone else can do the commit and you can move it from their repo to yours OR, more commonly, they will push it to a shared upstream repo and you can pull it down and merge it with yours.
ReplyDelete