From 3be05ab3abb57e2619b294a75df3f671f19ea515 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Thu, 25 Jan 2024 09:53:10 +0100
Subject: [PATCH 1/4] Update PR template

After move of master branch to MC2.
---
 .github/pull_request_template.md | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index ab6979292..5176792c3 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -17,23 +17,6 @@
 
 <!-- Cross-out the above items using ~crossed out item~ if they happen not to be relevant -->
 
-##### Compatibility with MathComp 2.0
-
-<!-- MathComp-Analysis is compatible with MathComp < 2.0 (branch `master`) and
-     MathComp 2.0 ([branch `hierarchy-builder`](https://github.com/math-comp/analysis/pull/698)).
-
-     If this PR targets `master` and if it is merged, the merged commit will also be
-     cherry-picked on the branch `hierarchy-builder`.
-
-     In this case, it would be helpful if the author of the PR also prepares a PR
-     for the branch `hierarchy-builder` or at least warns maintainers with an issue
-     to delegate the work. -->
-
-<!-- use the tag TODO: HB port to record divergences between `master` and `hierarchy-builder` -->
-
-- [ ] I added the label `TODO: HB port` to make sure someone ports this PR to
-      the `hierarchy-builder` branch **or** I already opened an issue or PR (please cross reference).
-
 <!-- leave this note as a reminder to reviewers -->
 ##### Automatic note to reviewers
 

From e6d2bad68dbf005f7cc04dcd7e4525ce113b0d3b Mon Sep 17 00:00:00 2001
From: Reynald Affeldt <reynald.affeldt@aist.go.jp>
Date: Thu, 25 Jan 2024 23:04:02 +0900
Subject: [PATCH 2/4] add note about changelog

---
 .github/pull_request_template.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 5176792c3..75de53645 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -4,20 +4,22 @@
 
 <!-- you may also explain what remains to do if the fix is incomplete -->
 
-##### Things done/to do
+##### Checklist
 
-<!-- please fill in the following checklist -->
 - [ ] added corresponding entries in `CHANGELOG_UNRELEASED.md`
 
+<!-- rebasing often messes with CHANGELOG_UNRELEASED.md -->
+<!-- consider using a temporary CHANGELOG_PR1234.md instead -->
 <!-- only append to minimize problems when merging/rebasing -->
 <!-- consider the use of `changelog/changes.sh` from
      https://github.com/math-comp/tools to generate the changelog -->
 
 - [ ] added corresponding documentation in the headers
 
-<!-- Cross-out the above items using ~crossed out item~ if they happen not to be relevant -->
+<!-- Cross-out the above items using ~crossed out item~ when irrelevant -->
 
-<!-- leave this note as a reminder to reviewers -->
-##### Automatic note to reviewers
+##### Reminder to reviewers
 
-Read [this Checklist](https://github.com/math-comp/math-comp/wiki/Checklist-for-creating-and-review-PRs) and put a milestone if possible.
+- Read [this Checklist](https://github.com/math-comp/math-comp/wiki/Checklist-for-creating-and-review-PRs)
+- Put a milestone if possible.
+- Check labels.

From 94c67cd36ad898f1289c92b4cb7c7504feb61798 Mon Sep 17 00:00:00 2001
From: Reynald Affeldt <reynald.affeldt@aist.go.jp>
Date: Thu, 25 Jan 2024 23:06:56 +0900
Subject: [PATCH 3/4] add howto link

---
 .github/pull_request_template.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 75de53645..ce63db6ac 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -16,6 +16,8 @@
 
 - [ ] added corresponding documentation in the headers
 
+Reference: [How to document](https://github.com/math-comp/math-comp/wiki/How-to-document)
+
 <!-- Cross-out the above items using ~crossed out item~ when irrelevant -->
 
 ##### Reminder to reviewers

From 530bb3cc37ddcf1fa8c7b39cf09d2fd33fb33948 Mon Sep 17 00:00:00 2001
From: Reynald Affeldt <reynald.affeldt@aist.go.jp>
Date: Thu, 25 Jan 2024 23:09:12 +0900
Subject: [PATCH 4/4] fix

---
 .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 ce63db6ac..f2b2fc280 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -23,5 +23,5 @@ Reference: [How to document](https://github.com/math-comp/math-comp/wiki/How-to-
 ##### Reminder to reviewers
 
 - Read [this Checklist](https://github.com/math-comp/math-comp/wiki/Checklist-for-creating-and-review-PRs)
-- Put a milestone if possible.
-- Check labels.
+- Put a milestone if possible
+- Check labels