learn_git add a line create a branch 'dev' create a master feature add merge fast forward add line fix bug 01 <<<<<<< HEAD master continues check git rebase asdfjaksdjf;kjas;dlkjfklj update README