contrib guide: Describe how to resolve merge conflicts

[nojnhuh]

This PR updates the contributor guide to describe why git merge is preferable to git rebase for resolving merge conflicts while a PR is being reviewed.

Which issue(s) this PR fixes:

Fixes #

[jberkus]

This is a good start, but I feel like a section called "Resolving Merge Conflicts" needs to provide some actual instructions on how to resolve them. Links to public git/github resources are fine, if they are good instructions.

[jberkus]

See previous comment

[nojnhuh]

This is a good start, but I feel like a section called "Resolving Merge Conflicts" needs to provide some actual instructions on how to resolve them. Links to public git/github resources are fine, if they are good instructions.

Added this link to GitHub's docs which provide a good entrypoint: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts

These are the most similar Git docs I could find about resolving conflicts, but it's a bit buried in a larger sequence of steps and not as applicable in this context: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts

[nojnhuh]

/hold for squash

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Kelleretoro, nojnhuh
Once this PR has been reviewed and has the lgtm label, please assign mrbobbytables for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• contributors/guide/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment