Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: enhancements to Git terms section

...

master: this is the main code branch, equivalent to trunk in Subversion. Branches are generally created off of master. However, it is usually recommended that you not do your work directly in the master branch. Instead, you should look to create new branches frequently (e.g. a new branch for each feature/ticket you are working on), as both branches and merges are much easier in Git. For more information, see Pro-Git's chapter on "Basic Branching & Merging"

origin: the default remote repository (at GitHub) that all your branches are pull'ed from and push'ed to. This is defined when you execute the initial git clone command. For more information see Pro Git's chapter on "Working with remotes"

unpublished vs. published branches: an unpublished branch is a branch that only exists on your local workstation, in your local repository. Nobody but you know that branch exists. A published branch is one that has been push'ed up to githubGitHub, and is available for other developers to checkout and work on.

...