basic commands
add code tag
Merge branch 'init'
add -u explaination
Merge branch 'init'
resolved conflict
add git status
Merge branch 'basic'
Merge branch 'init'