First line, learn git command, change the first line. Second line, git init. Add Third Line. Add Fourth Line. <<<<<<< HEAD Add in master. Add a [master] new line in dev ======= Add in feature1 branch; Add a [feature1] new line in dev creat a new line in feature1 branch >>>>>>> feature1