git-practice このリポジトリはGit動画講座用です. test test new feature automatic merge merge conflict update on github update on local git stash conflict stash under track stash (1st)