a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3377 from cdr/jsjoeio/docs-clean-commits 

docs(contributing): add commits section
This commit is contained in:
Joe Previte 2021-05-14 13:54:24 -07:00 committed by GitHub
parent a7cf990782 60d71fee6f
commit 509d91ddab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -71,6 +71,7 @@ VS Code v1.56
- docs(maintaining): add pull requests section #3378 @jsjoeio - docs(maintaining): add pull requests section #3378 @jsjoeio
- docs(maintaining): add merge strategies section #3379 @jsjoeio - docs(maintaining): add merge strategies section #3379 @jsjoeio
- refactor: move default PR template #3375 @jsjoeio - refactor: move default PR template #3375 @jsjoeio
- docs(contributing): add commits section #3377 @jsjoeio
### Development ### Development

9
docs/CONTRIBUTING.md
View File

@ -3,6 +3,7 @@
# Contributing # Contributing
- [Pull Requests](#pull-requests) - [Pull Requests](#pull-requests)
- [Commits](#commits)
- [Requirements](#requirements) - [Requirements](#requirements)
- [Development Workflow](#development-workflow) - [Development Workflow](#development-workflow)
- [Updating VS Code](#updating-vs-code) - [Updating VS Code](#updating-vs-code)
@ -23,9 +24,11 @@ you'd like to address unless the proposed fix is minor.
In your Pull Requests (PR), link to the issue that the PR solves. In your Pull Requests (PR), link to the issue that the PR solves.
Please ensure that the base of your PR is the **master** branch. (Note: The default Please ensure that the base of your PR is the **main** branch.
GitHub branch is the latest release branch, though you should point all of your changes to be merged into
master). ### Commits
We prefer a clean commit history. This means you should squash all fixups and fixup-type commits before asking for review (cleanup, squash, force-push). If you need help with this, feel free to leave a comment in your PR and we'll guide you.
## Requirements ## Requirements