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

docs(maintaining): add pull requests section by jsjoeio · Pull Request #3378 · coder/code-server · GitHub

/ code-server Public

docs(maintaining): add pull requests section - #3378

Merged
jsjoeio merged 2 commits into
mainfrom
jsjoeio/milestones-issues
May 13, 2021
ConversationCommits (2)ChecksFiles changed
Merged

docs(maintaining): add pull requests section#3378
jsjoeio merged 2 commits into
mainfrom
jsjoeio/milestones-issues

Conversation

jsjoeio commented May 12, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

This PR adds a section about pull requests and associating with milestones to MAINTAINING.md.

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/milestones-issues branch from 8226bb4 to 5469e61 Compare May 12, 2021 22:36
jsjoeio requested review from code-asher and oxy and removed request for code-asher May 12, 2021 22:36
jsjoeio marked this pull request as ready for review May 12, 2021 22:37
jsjoeio requested a review from a team as a code owner May 12, 2021 22:37

codecov Bot commented May 12, 2021 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #3378 (c0b2748) into main (d2337bc) will not change coverage.
The diff coverage is n/a.

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

@@           Coverage Diff           @@
##             main    #3378   +/-   ##
=======================================
  Coverage   59.21%   59.21%           
=======================================
  Files          35       35           
  Lines        1709     1709           
  Branches      379      379           
=======================================
  Hits         1012     1012           
  Misses        559      559           
  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 d2337bc...7be1ae3. Read the comment docs.

bpmct approved these changes May 13, 2021
View reviewed changes

bpmct left a comment

Copy link
Copy Markdown
Member

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

fixed a minor typo with the semver URL in this too

Comment thread docs/MAINTAINING.md Outdated
Comment on lines +76 to +77
### Merge Strategies

For most things, we recommend "Squash and Merge". If you're updating `lib/vscode`, we suggest using the "Rebase and Merge" strategy. There may be times where "Create a merge commit" makes sense as well. Use your best judgement.

bpmct May 13, 2021

Copy link
Copy Markdown
Member

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

Awesome to see this included.

jsjoeio May 13, 2021

Copy link
Copy Markdown
Contributor Author

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

Thanks for fixing that typo too!

jawnsy May 13, 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

Examples are always nice - for the "Create a merge commit" flow, if you have any. You might also want to mention that if you're unsure, to discuss with the team?

jsjoeio May 13, 2021

Copy link
Copy Markdown
Contributor Author

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

I don't have a good example off the top of my head but if you have one and want to add it, feel free to add in a follow-up PR? I'll add that last part about discussing with the team though! Good idea.

jsjoeio force-pushed the jsjoeio/milestones-issues branch 2 times, most recently from b6e5455 to 9e8d233 Compare May 13, 2021 17:17
oxy approved these changes May 13, 2021
View reviewed changes

oxy left a comment

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

Looks good!

jsjoeio enabled auto-merge May 13, 2021 19:25
jsjoeio force-pushed the jsjoeio/milestones-issues branch from 9e8d233 to 89afe9c Compare May 13, 2021 19:25
jsjoeio disabled auto-merge May 13, 2021 19:25
jsjoeio enabled auto-merge May 13, 2021 19:27
jsjoeio force-pushed the jsjoeio/milestones-issues branch from 89afe9c to 7be1ae3 Compare May 13, 2021 19:27
jsjoeio merged commit 10f512c into main May 13, 2021
jsjoeio deleted the jsjoeio/milestones-issues branch May 13, 2021 19:32
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

bpmct bpmct approved these changes
code-asher Awaiting requested review from code-asher
+2 more reviewers
jawnsy jawnsy left review comments
oxy oxy 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.

4 participants

Back | FazBrowse Home | New Git URL