diff options
| -rw-r--r-- | pull_request_template.md | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pull_request_template.md b/pull_request_template.md index efe105d8cfb..fde2c1b4b47 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -1,6 +1,6 @@ -[//]: # (************************************************************) -[//]: # (** DON'T DELETE THIS TEMPLATE ELSE YOUR PR WILL BE CLOSED **) -[//]: # (************************************************************) +[//]: # (*********************************) +[//]: # (** DO NOT DELETE THIS TEMPLATE **) +[//]: # (*********************************) **Changes proposed:** @@ -8,19 +8,19 @@ - - -**Target branch(es):** 3.3.5/6.x +**Target branch(es):** 3.3.5/master **Issues addressed:** Closes # -**Tests performed:** (Does it build, tested in-game, etc) +**Tests performed:** (Does it build, tested in-game, etc.) **Known issues and TODO list:** - [ ] - [ ] +**DEPRECATION NOTICE** When creating new PRs to the (old) 6.x branch, make sure the target branch is **master** instead of 6.x. **NOTE** Enable the setting "Allow edits from maintainers." when creating your pull request. -**NOTE** If your Pull Request is ONLY SQL create an issue instead! -**NOTE** You no longer need to squash your commits, on merge we will squash it for you. (GitHub added a new feature) - -**SUGGESTION** If your Pull Request contains SQL give it an impossible date, for example 9999_99_99_99_database.sql. This way it will be free on merge. Myself, i prefer to use 9999_99_99_xxxxx.sql where xxxxx is the id of the pull request, on that way we can merge multiple pull requests containing sql files on a row and rename the files with a single commit. +**NOTE** If this PR __only__ contains SQL files, create an issue instead. +**NOTE** Squashing commits is not required. +**SUGGESTION** When adding new SQL files, name them 9999_99_99_99_db_name.sql to reduce the chance of possible merge conflicts. |