git is a distributed version contral system git is aaaa free software distributed under the GPL ADD ONE LINE creating a new branch is quick <<<<<<< HEAD Creating a new branch is quick & simple. ======= Creating a new branch is quick and simple. >>>>>>> feature1 change again <<<<<<< HEAD this is master ======= this is dev >>>>>>> dev