From d46f7dcd29d27c887a6f47623148f69b86db3246 Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 31 Jan 2022 17:42:02 +0100 Subject: [PATCH 1/8] GH: add PR template --- .github/PULL_REQUEST_TEMPLATE.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000000..56b62fc363a3 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,14 @@ +# Before submitting + +- [ ] Was this discussed/approved via a Github issue? (no need for typos and docs improvements) +- [ ] Did you make sure to update the docs? +- [ ] Did you write any new necessary tests? + +## What does this PR do? + +Fixes # (issue). + +## PR review + +Anyone in the community is free to review the PR once the tests have passed. +If we didn't discuss your PR in Github issues there's a high chance it will not be merged. From b0b8f9ff183b10e58a25028537c2846afa430b44 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Mon, 21 Feb 2022 12:12:54 +0100 Subject: [PATCH 2/8] Update CONTRIBUTING.md --- CONTRIBUTING.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fcceba28d378..ebde03a562a0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -42,17 +42,17 @@ changes** button. All done, your PR is now submitted to YOLOv5 for review and ap To allow your work to be integrated as seamlessly as possible, we advise you to: - ✅ Verify your PR is **up-to-date with upstream/master.** If your PR is behind upstream/master an - automatic [GitHub actions](https://github.com/ultralytics/yolov5/blob/master/.github/workflows/rebase.yml) rebase may - be attempted by including the /rebase command in a comment body, or by running the following code, replacing 'feature' - with the name of your local branch: - - ```bash - git remote add upstream https://github.com/ultralytics/yolov5.git - git fetch upstream - git checkout feature # <----- replace 'feature' with local branch name - git merge upstream/master - git push -u origin -f - ``` + automatic [GitHub Actions](https://github.com/ultralytics/yolov5/blob/master/.github/workflows/rebase.yml) merge may + be attempted by writing /rebase in a new comment, or by running the following code, replacing 'feature' with the name + of your local branch: + +```bash +git remote add upstream https://github.com/ultralytics/yolov5.git +git fetch upstream +# git checkout feature # <--- replace 'feature' with local branch name +git merge upstream/master +git push -u origin -f +``` - ✅ Verify all Continuous Integration (CI) **checks are passing**. - ✅ Reduce changes to the absolute **minimum** required for your bug fix or feature addition. _"It is not daily increase From 36703778a10d5ad4b1d661a9f67fb064d1633fd9 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Mon, 21 Feb 2022 12:29:41 +0100 Subject: [PATCH 3/8] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 56b62fc363a3..0c5aa7cef846 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,14 +1,9 @@ -# Before submitting + From a1874b84ea5093d5be17298e4bb85222313b4d10 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 21 Feb 2022 11:29:52 +0000 Subject: [PATCH 4/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0c5aa7cef846..3186a6ecf9cc 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,5 +5,5 @@ Thank you for submitting a YOLOv5 🚀 Pull Request! We want to make contributin - Link this PR to a YOLOv5 [issue](https://github.com/ultralytics/yolov5/issues) to help us understand what bug fix or feature is being implemented. - Provide before and after profiling/inference/training results to help us quantify the improvement your PR provides (if applicable). -Please see our ✅ [Contributing Guide](https://github.com/ultralytics/yolov5/blob/master/CONTRIBUTING.md) for a detailed guide on PRs. +Please see our ✅ [Contributing Guide](https://github.com/ultralytics/yolov5/blob/master/CONTRIBUTING.md) for a detailed guide on PRs. ---> From 8044001cc262bd7caa9ba20f800b60e4085a7ca4 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Mon, 21 Feb 2022 12:30:07 +0100 Subject: [PATCH 5/8] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3186a6ecf9cc..ddb3dee926d7 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,5 @@ From f94ea51dffb425bed4adf43c1ba6e3b1204b3764 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Mon, 21 Feb 2022 12:31:38 +0100 Subject: [PATCH 7/8] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d9b46bb46d0e..837e9e844aba 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,5 +5,5 @@ Thank you for submitting a YOLOv5 🚀 Pull Request! We want to make contributin - Link this PR to a YOLOv5 [issue](https://github.com/ultralytics/yolov5/issues) to help us understand what bug fix or feature is being implemented. - Provide before and after profiling/inference/training results to help us quantify the improvement your PR provides (if applicable). -Please see our ✅ [Contributing Guide](https://github.com/ultralytics/yolov5/blob/master/CONTRIBUTING.md) for a full guide on YOLOv5 PR best practices. +Please see our ✅ [Contributing Guide](https://github.com/ultralytics/yolov5/blob/master/CONTRIBUTING.md) for more details. ---> From 4b6fdfac892c6fd8f31227e75c2fe9366b8072c8 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Mon, 21 Feb 2022 12:36:20 +0100 Subject: [PATCH 8/8] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 837e9e844aba..7a3e1b7ddfbc 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,3 @@ -