merge no Creating a new branch is quick. gitskills Creating a new branch is quick and simple. <<<<<<< HEAD later last feature