feat(issue-62): make cherry-pick strategy configurable

[lampajr]

Thank you for submitting this pull request

fix #62

In addition to the configurable cherry-pick strategy I added an error log containing the git diff result whenever the tool fails resolving conflicts, hope it can help, e.g.,

[INFO] Cherry picking cfd55f162d743c5e7eaefb8c24cf7b001108fe03.
[ERROR] Error: Error: Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
error: could not apply cfd55f16... Merge pull request #2684 from shiftstack/advertise-slack
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

Showing git diff:
diff --cc README.md
index e2520361,8826bc83..00000000
--- a/README.md
+++ b/README.md
@@@ -1,12 -1,13 +1,18 @@@
  # Gophercloud: an OpenStack SDK for Go
 -[![Coverage Status](https://coveralls.io/repos/github/gophercloud/gophercloud/badge.svg?branch=master)](https://coveralls.io/github/gophercloud/gophercloud?branch=master)
 +[![Coverage Status](https://coveralls.io/repos/github/gophercloud/gophercloud/badge.svg?branch=v1)](https://coveralls.io/github/gophercloud/gophercloud?branch=v1)
  
 -[Reference documentation](http://godoc.org/github.com/gophercloud/gophercloud)
 +Gophercloud is an OpenStack Go SDK.
  
 -Gophercloud is a Go SDK for OpenStack.
 +## Useful links
  
++<<<<<<< HEAD
 +* [Reference documentation](http://godoc.org/github.com/gophercloud/gophercloud)
 +* [Effective Go](https://golang.org/doc/effective_go.html)
++=======
+ Join us on kubernetes slack, on [#gophercloud](https://kubernetes.slack.com/archives/C05G4NJ6P6X). Visit [slack.k8s.io](https://slack.k8s.io) for an invitation.
+ 
+ This is the development branch of Gophercloud; stable releases are cut from the branch `v1`.
++>>>>>>> cfd55f16 (Merge pull request #2684 from shiftstack/advertise-slack)

Referenced pull requests

Checklist

• Tests added if applicable.
• Documentation updated if applicable.

Note: dist/cli/index.js and dist/gha/index.js are automatically generated by git hooks and gh workflows.

First time here?

This project follows git conventional commits pattern, therefore the commits should have the following format:

<type>(<optional scope>): <subject>
empty separator line
<optional body>
empty separator line
<optional footer>

Where the type must be one of [build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test]

NOTE: if you are still in a work in progress branch and you want to push your changes remotely, consider adding --no-verify for both commit and push, e.g., git push origin <feat-branch> --no-verify - this could become useful to push changes where there are still tests failures. Once the pull request is ready, please amend the commit and force-push it to keep following the adopted git commit standard.

How to prepare for a new release?

There is no need to manually update package.json version and CHANGELOG.md information. This process has been automated in Prepare Release Github workflow.

Therefore whenever enough changes are merged into the main branch, one of the maintainers will trigger this workflow that will automatically update version and changelog based on the commits on the git tree.

More details can be found in package release section of the README.

[Ginxo]

LGTM