In this workshop, we will look at the steps beyond “git add” and “git commit” and look at some of the less frequently used (but still important!) git commands to help you resolve common issues that arise in git controlled projects.

We will cover the following Topics (selection):

- Branching and Remotes (branch, switch, remote)
- Undoing Changes (revert, reset)
- Merging & Resolving Merge Conflicts
- Tagging (tag)
- Branching Models and Workflows
- Cherry Picking (cherry-pick)
- Rebasing (rebase, interactive rebase)