Basic concepts

Common terms

  • repository: where the source code is
  • remote (cloud) and local (machine)
  • clone: create a local copy of a remote repository
  • fetch: identify existing changes in the remote repository
  • merge: combine changes from different versions
  • pull: identify the changes and combine (fetch + merge)
  • add: add your local changes to a pile of changes
  • commit: create a timestamp for the changes in the pile
  • push: send the commits from local to remote repository
  • branch: a copy from your code that has an independent timeline
  • stash: group of changes detached from the branch
  • pull request: request to incorporate a specific branch to the main repository

Forking

Forking workflow

Branches

Forking workflow