From 2e322f183c95bcd32b64fba2911c0c81b23d1609 Mon Sep 17 00:00:00 2001 From: Charles Aracil Date: Fri, 9 Oct 2020 16:09:52 +0200 Subject: [PATCH] ask for commit after changelog and authors file edit (#7878) --- CONTRIBUTING.rst | 11 +++++------ changelog/7878.doc.rst | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 changelog/7878.doc.rst diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 48ba147b7..2669cb195 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -299,12 +299,6 @@ Here is a simple overview, with pytest-specific bits: $ pytest testing/test_config.py - -#. Commit and push once your tests pass and you are happy with your change(s):: - - $ git commit -a -m "" - $ git push -u - #. Create a new changelog entry in ``changelog``. The file should be named ``..rst``, where *issueid* is the number of the issue related to the change and *type* is one of ``feature``, ``improvement``, ``bugfix``, ``doc``, ``deprecation``, ``breaking``, ``vendor`` @@ -313,6 +307,11 @@ Here is a simple overview, with pytest-specific bits: #. Add yourself to ``AUTHORS`` file if not there yet, in alphabetical order. +#. Commit and push once your tests pass and you are happy with your change(s):: + + $ git commit -a -m "" + $ git push -u + #. Finally, submit a pull request through the GitHub website using this data:: head-fork: YOUR_GITHUB_USERNAME/pytest diff --git a/changelog/7878.doc.rst b/changelog/7878.doc.rst new file mode 100644 index 000000000..ff5d00d6c --- /dev/null +++ b/changelog/7878.doc.rst @@ -0,0 +1 @@ +In pull request section, ask to commit after editing changelog and authors file.