Merge strategy

Related Git-client-plugin pull request:
https://github.com/jenkinsci/git-client-plugin/pull/20