docs(contrib): add notes on handling merge conflicts #13634
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses some of my comments in #13631 (comment) and adds some things I've noted on Slack and in #12592 (comment) before too
Motivation
Add a few small best practices for dealing with merge conflicts that I've been using
Plus clarify a contradictory piece that may have confused Alan
Modifications
Other modifications
remove
chore(deps)
,build
, andci
from the "list of commits"add
docs
to this list since we now have versioned documentation Versioned documentation #11390add note about pinning release announcements in Slack
Verification
make docs
passes