Skip to content

Commit 337959a

Browse files
authored
docs: treat all work as PUBLIC aws#6125
1 parent 9a97f8a commit 337959a

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
---
88

9-
<!--- REMINDER: Ensure that your PR meets the guidelines in CONTRIBUTING.md -->
9+
- Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time.
10+
- Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
1011

1112
License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

CONTRIBUTING.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,12 @@ You can find documentation to create VSCode IDE settings for CodeCatalyst bluepr
238238
239239
Before sending a pull request:
240240
241+
1. Treat all work as PUBLIC. Private `feature/x` branches will _not_ be squash-merged at release time. This has several benefits:
242+
- Avoids mistakes (accidental exposure to public)!
243+
- Avoids needing to erase (squash-merge) history.
241244
1. Check that you are working against the latest source on the `master` branch.
242-
2. Check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
243-
3. Open an issue to discuss any significant work.
245+
1. Check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
246+
1. Open an issue to discuss any significant work.
244247
245248
To send a pull request:
246249

0 commit comments

Comments
 (0)