create commit
Merge https://github.com/kaichung63/GitTest_Jinx
add hotfix file
add hotfix2
add issul file.
Merge branch 'issul'
update hotfixFile on master.
update hotfixFile on hotfix branch.
fix conflict