WP: 3327 test for Git command

the following parts include how to use git to merge the confliction