The first commit
branch change
branch b change
commit more b
a change
master a commit
a cc
resolve conflict
commit d.txt
create e.txt
Merge branch 'b'
Merge branch 'master' of https://github.com/DoVinh/demo