From 3ee01c6471092445ee5becdcd05622fca753613a Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Fri, 9 Mar 2018 15:36:29 +0100 Subject: [PATCH 1/2] Ask users to create two commits for reproducers --- contributing/code/reproducer.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contributing/code/reproducer.rst b/contributing/code/reproducer.rst index 0970073ddb0..617b750a55e 100644 --- a/contributing/code/reproducer.rst +++ b/contributing/code/reproducer.rst @@ -44,7 +44,9 @@ edition. To do so: ``reproduce_23657``, etc.) #. Now you must add the minimum amount of code to reproduce the bug. This is the trickiest part and it's explained a bit more later. -#. Add, commit and push all your changes. +#. Add, commit and push all your changes. If possible, make one commit for the + initial contents created by Symfony and a second commit that only contains + your own changes. #. Add a comment in your original issue report to share the URL of your forked project (e.g. ``https://github.com/YOUR-GITHUB-USERNAME/symfony-standard/tree/issue_23567``) and, if necessary, explain the steps to reproduce (e.g. "browse this URL", From 494972f9c9de7f666eda9937a793253d2b1e1a34 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 13 Mar 2018 08:36:33 +0100 Subject: [PATCH 2/2] Reword after review --- contributing/code/reproducer.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contributing/code/reproducer.rst b/contributing/code/reproducer.rst index 617b750a55e..26049b094c9 100644 --- a/contributing/code/reproducer.rst +++ b/contributing/code/reproducer.rst @@ -42,11 +42,10 @@ edition. To do so: ``git clone git://github.com/YOUR-GITHUB-USERNAME/symfony-standard.git`` #. Browse the project and create a new branch (e.g. ``issue_23567``, ``reproduce_23657``, etc.) +#. Add and commit the changes generated by Symfony. #. Now you must add the minimum amount of code to reproduce the bug. This is the trickiest part and it's explained a bit more later. -#. Add, commit and push all your changes. If possible, make one commit for the - initial contents created by Symfony and a second commit that only contains - your own changes. +#. Add, commit and push all your own changes. #. Add a comment in your original issue report to share the URL of your forked project (e.g. ``https://github.com/YOUR-GITHUB-USERNAME/symfony-standard/tree/issue_23567``) and, if necessary, explain the steps to reproduce (e.g. "browse this URL",