There are multiple ways that Git can be used, and what is recommended depends on 1) what you do 2) How you work (alone or in a team) 3) your own git maturity.
Git can be hard to get used to, and when you come from other systems, like TFS VC, it takes time unlearning old habits and time learning the new Git ways.
We can set up 4 levels or scenarios:
| Level | Size | Description | Maturity | Links |
|---|---|---|---|---|
| 1 | Lone developer | Working alone or alone at a given time | All new | Survival Guide to Git |
| 2 | A small team | Two or more working at the same time | Beginner | Overview of branching in Git, Working with Git Branches |
| 3 | A team | Using pull requests and conventions on published branch naming | Moderate | Pull Requests in Git |
| 4 | A team | A team working actively with lots of commits and pushes | Experienced | Rebasing in Git, Cleaning up Git mess |
When you get into issues with your Git repo, the following posts can help you out:
Git Amend Commit: How to add/change files and change comments on commits you have done