contrib guide: Describe how to resolve merge conflicts#8951

nojnhuh wants to merge 1 commit into

kubernetes:mainkubernetes/community:mainfrom

nojnhuh:howto-resolve-conflictsnojnhuh/community:howto-resolve-conflictsCopy head branch name to clipboard