switch commit
git add
merge commit
Merge branch 'develop' into Server
small modified
modify input stream and output stream
small modify
fuck
after merge develop
merge with server done
after pull
before checkout
stage 1 done
small modification
merge stage 1 to develop