现在储存到了本地仓库
Merge branch 'newBranch' of
https://github.com/lilei060202112/testgit.git into newBranch

Conflicts:
	Testgit/src/Testgit.java