diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 6a04bd0..23c2361 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,24 +1,16 @@ -## Backport - -Is this a cherry-picked backport from the default branch? -If so, please delete all other sections and complete the sentence below: - -Cherry-pick #1236 (main PR) to release/v1 (release branch) -Addresses #1235 (backport issue) for #1234 (main issue) - - ## Related Issue -If this PR will target main, -please complete the below sentence and add labels for each version this should be released to. +If this PR will target main, please complete the below sentence. Addresses #1234 (main issue) -This should be backported to release/v0, release/v1 (comma separated list of target release branches) + +## Releases + +If this PR should be released, please add labels for each release branch it targets. ## Description -Describe your approach to addressing the issue linked above. -For example, if you made a particular design decision, let us know why you chose this path. +Describe your change and how it addresses the issue linked above. ## Testing @@ -28,3 +20,11 @@ Please describe how you verified this change or why testing isn't relevant. Does this change alter an interface that users of the provider will need to adjust to? Will there be any existing configurations broken by this change? + +## Backport + +Is this a cherry-picked backport from the default branch? +If so, please delete all other sections and complete the sentence below: + +Cherry-pick #1236 (main PR) to release/v1 (release branch) +Addresses #1235 (backport issue) for #1234 (main issue) diff --git a/aspell_custom.txt b/aspell_custom.txt index ef203ef..f8d4fb8 100644 --- a/aspell_custom.txt +++ b/aspell_custom.txt @@ -11,3 +11,4 @@ terraform tflint gorelease repo +pr