ignore file
file.txt
Merge branch 'dev' of github.com:zengjianbing/test into dev
update test.txt local
merge fix conflicts