WP: 3327 test for Git command

the following parts include how to use git to merge the confliction
Merge branch 'master' of github.com:Gabriel1688/DragonBall

Conflicts:
	test.txt