FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

docs(maintaining): add merge strategies section by jsjoeio · Pull Request #3379 · coder/code-server · GitHub

/ code-server Public

docs(maintaining): add merge strategies section - #3379

Merged
jsjoeio merged 1 commit into
jsjoeio/milestones-issuesfrom
jsjoeio/docs-merge-strategy
May 12, 2021
ConversationCommits (1)ChecksFiles changed
Merged

docs(maintaining): add merge strategies section#3379
jsjoeio merged 1 commit into
jsjoeio/milestones-issuesfrom
jsjoeio/docs-merge-strategy

Conversation

jsjoeio commented May 12, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

This PR updates MAINTAINING.md with "Merge Strategies" providing some recommendations.

Checklist

  • updated CHANGELOG.md

jsjoeio added this to the v3.11.0 milestone May 12, 2021
jsjoeio added the docs Documentation related label May 12, 2021
jsjoeio self-assigned this May 12, 2021
jsjoeio force-pushed the jsjoeio/docs-merge-strategy branch from 5660dba to 7a8701b Compare May 12, 2021 22:49
jsjoeio changed the base branch from main to jsjoeio/milestones-issues May 12, 2021 22:50

codecov Bot commented May 12, 2021 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #3379 (7a8701b) into jsjoeio/milestones-issues (5469e61) will not change coverage.
The diff coverage is n/a.

❗ Current head 7a8701b differs from pull request most recent head b5c9ae8. Consider uploading reports for the commit b5c9ae8 to get more accurate results

@@                    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.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5469e61...b5c9ae8. Read the comment docs.

jsjoeio force-pushed the jsjoeio/docs-merge-strategy branch from 7a8701b to b5c9ae8 Compare May 12, 2021 22:53
jsjoeio marked this pull request as ready for review May 12, 2021 22:53
jsjoeio requested a review from a team as a code owner May 12, 2021 22:53
jawnsy reviewed May 12, 2021
View reviewed changes
Comment thread CHANGELOG.md

- docs(install): add raspberry pi section #3376 @jsjoeio
- docs(maintaining): add pull requests section #3378 @jsjoeio
- docs(maintaining): add merge strategies section #3379 @jsjoeio

jawnsy May 12, 2021

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

while you're here, can you also fix my changelog entry below? 🙏 I forgot the PR number and author info 😳

jsjoeio merged commit 6cadbc4 into jsjoeio/milestones-issues May 12, 2021
jsjoeio deleted the jsjoeio/docs-merge-strategy branch May 12, 2021 22:59
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
jawnsy jawnsy approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

jsjoeio

Labels

docs Documentation related

Projects

None yet

Milestone

v3.10.1

Development

Successfully merging this pull request may close these issues.

2 participants

Back | FazBrowse Home | New Git URL