summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/pull_request_template.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 0f4b7955..d25908ef 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -29,6 +29,7 @@ _Please ensure all are ticked (and actually done):_
- [ ] Code has been self-reviewed
- [ ] Code has been tested and no new breakage is introduced
- [ ] Documentation has been added/updated if needed
+- [ ] No merge conflicts arise from the change
## Other information