ok?
modify the error
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	src/com/test/git/TestGit.java