修改后不直接同步查看冲突
Merge branch 'master' of https://github.com/woodworking/HelloGitHub

Conflicts:
	assets/open.TXT
	
	
	冲突解决
冲突解决