docs(maintaining): add merge strategies section #3379
Merged
+6
−0
Conversation
This file contains 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
jsjoeio
force-pushed
the
jsjoeio/docs-merge-strategy
branch
from
5660dba
to
7a8701b
Compare
Codecov Report
@@ Coverage Diff @@
## jsjoeio/milestones-issues #3379 +/- ##
==========================================================
Coverage 58.95% 58.95%
==========================================================
Files 35 35
Lines 1703 1703
Branches 374 374
==========================================================
Hits 1004 1004
Misses 561 561
Partials 138 138 Continue to review full report at Codecov.
|
jsjoeio
force-pushed
the
jsjoeio/docs-merge-strategy
branch
from
7a8701b
to
b5c9ae8
Compare
jawnsy
reviewed
May 12, 2021
| @@ -69,6 +69,7 @@ VS Code v1.56 | |||
|
|
|||
| - docs(install): add raspberry pi section #3376 @jsjoeio | |||
| - docs(maintaining): add pull requests section #3378 @jsjoeio | |||
| - docs(maintaining): add merge strategies section #3379 @jsjoeio | |||
There was a problem hiding this comment.
while you're here, can you also fix my changelog entry below? 🙏 I forgot the PR number and author info 😳
jawnsy
approved these changes
May 12, 2021
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.
This PR updates
MAINTAINING.mdwith "Merge Strategies" providing some recommendations.Checklist
CHANGELOG.md