add 01.file
conflict
conflict a.file
solve conflict
modify f.file
modify e.file
conflict
add 02.file
Merge branch 'test' of https://github.com/liulin1987315/git_learning_by_doing into test