Practice git branch and merge branch changes and conflict, rebase Test folder ~/playgit ~/two/playgit