add file: add file
git ls
dev _test.txt
New branch: modify README.
Modify a file: README.md
Conflict fixed