commit test branch file World.html
the feature1 first edit World.html file
master branch commit World.html
commit confict fixed
commit --no-ff test World.html
merge with no-ff
test stash doc On Hello.html
merged bug fix 101
commit working on Hello.html
last commit 111