I use git almost every day, and I still have to look up commands and workarounds to error messages sometimes. Merging is still a little hard for me, though git-flow helps with my normal workflow.