Does anyone know a good resource for learning how to use Git properly? I've learned piecemeal over the last year, but still run into stupid conflicts when transferring a project between machines that often requires me to redownload the repo and then download the changes from the dev server before starting again.

I'm an independent shop, so I don't have any senior devs or corporate policies to refer to for best practices.

Thanks in advance!