Git is a distributed version control system. Git is free software distributed under the GPL. Git has a mutable index called stage. <<<<<<< HEAD create a new branch but simple

create a new branch,maybe conflict

feature1