git knowledge base

git is a very powerful set of tools for version control. There are a lot of commands and you can do a lot of things in a lot of different ways. This knowledge base provides a collection of tips, best practices and workflows to steer you through the forest of choices you can make with git.

TOC

1. beginner
   1. aliases
   2. branch naming conventions
   3. commit message conventions
   4. linear vs non-linear history
   5. collaboration on master
2. advanced
   1. branching models
   2. how to integrate changes
      1. how to resolve feature branches
      2. from master to feature branch
   3. cherry-pick files
3. expert
4. cheat sheets