[conradfr]

My use of Git is basically to have a dev branch where I commit randomly, like some sort of ftp/backup, and a master branch that I merge from dev if I have a release ready.

The other day I tried to merge only some files from a new "experimental" branch and failed hard. I then realized I had it all wrong about how to successfully commit and manage branches.

And felt so lame :) The sad part is that I am the only one trying to use a CVS at work.

TL;DR : I still need to learn Git, so thank you everyone trying to "teach" it.