improve instructions about merging in the step-by-step guide #554
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
taleinat
force-pushed
the
pullrequest-merge-instructions
branch
from
d18e896 to
2bf8b70
Compare
methane
reviewed
Nov 18, 2019
terryjreedy
requested changes
Nov 18, 2019
terryjreedy
approved these changes
Nov 20, 2019
methane
approved these changes
Nov 20, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
See the original discussion on discuss.python.org.
This adds detailed instructions on how to deal with merges in two common cases:
I've tried to keep to the general tone of the guide, and specifically the "step-by-step" section, keeping things simple, short and straightforward.