搞定git,简单使用了
Merge branch 'master' of https://github.com/zwt/Test.git

Conflicts:
	src/test/Test.java