diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 000000000..dc7c80072 --- /dev/null +++ b/.github/pull.yml @@ -0,0 +1,9 @@ +version: "1" +rules: + - base: main + upstream: tteck:main + mergeMethod: merge # [none, merge, squash, rebase, hardreset] + conflictReviewers: + - asylumexp +label: ":arrow_heading_down: pull" +conflictLabel: "merge-conflict" diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index 39173ba08..000000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,18 +0,0 @@ -## I wanted to make you aware that I am meticulous when it comes to merging code into the main branch, so please don't take it personally if I reject your request. - -## Description - -Please include a summary of the change and/or which issue is fixed. - -Fixes # (issue) - -## Type of change - -Please delete options that are not relevant. - -- [ ] Bug fix (non-breaking change which fixes an issue) -- [ ] New feature (non-breaking change which adds functionality) -- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) -- [ ] New Script (Develop a new script or set of scripts that are fully functional and thoroughly tested) -- [ ] I have performed a self-review of my code, adhering to established codebase patterns and conventions. -- [ ] This change requires a documentation update