During the workshop, we will go through several advanced Git features. The best way of learning them though, is being on the necessity of using them. We will provoke these situations so that you can practice with Git.
Here you can find a very good cheat sheet on git commands (source).
Here a very recommendable vimcast about how to solve a merge conflict with VIM.