add how to use github
add operate branch
add merge <branch>
add conflict
add conflict???
all is well 01
Merge branch 'lzhn'
lzhn delete confict
merge with no-ff
fix issue01
add bug branch
Merge branch 'issue01'
add Bug branch