From 0c5d7e6b11db890b885cb7b543adb88345151599 Mon Sep 17 00:00:00 2001 From: Nicolas Coden Date: Tue, 17 Jan 2017 20:29:47 +0100 Subject: [PATCH] Update GitHub pull request template for the new git workflow --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3f4f466eb..f6e462fea 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,8 +1,8 @@ Before submitting a pull request, make sure it's targeting the right branch: - For documentation fixes, use `master`. -- For bug fixes, use `develop`. -- For new features, use the branch for the next minor version, which will be formatted `v6.x`. +- For bug fixes or new features compatible with the next version, use `develop`. +- For bug fixes incompatible with `develop`, use the support branch of the latest compatible version, which will be formatted `support/6.x`. If you're fixing a JavaScript issue, it would help to create a new test case under the folder `test/visual/` that recreates the issue and show's that it's been fixed. Run `npm test` to compile the testing folder. -- 2.47.2