Git is a distributed version control system. Git is a free software under the GPL. My stupid boss still prefers SVN. <<<<<<< HEAD Creating a new branch is quick and simple. ======= Creating a new branch is quick AND simple. >>>>>>> featurel git merge --no-ff method <<<<<<< HEAD this step i want to stash ======= this step i want to stash >>>>>>> master i want to master i want to dev this is from 209