git learn
add test.txt
test.txt Hello
update
modify some file
fixed conflict