com web/qa: Fix QA Pulls Tool merge instructions: .gitignore pulls/index.php

Commit: c3e1097e314c7490c9a466f4226cfab844854902 Author: Gabriel Caruso <carusogabriel34@gmail.com> Fri, 19 Oct 2018 01:28:15 -0300 Committer: Peter Kokot <peterkokot@gmail.com> Fri, 19 Oct 2018 08:15:31 +0200 Parents: e80874c2c8dfaf758157c07f43c7a4867490bab4 Branches: master Link: http://git.php.net/?p=web/qa.git;a=commitdiff;h=c3e1097e314c7490c9a466f4226cfab844854902 Log: Fix QA Pulls Tool merge instructions Ignore shared/ folder Add step to ensure to checkout the master branch Changed paths: M .gitignore M pulls/index.php Diff: diff --git a/.gitignore b/.gitignore index f730566..f0f495e 100755 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ reports/db/*.sqlite reports/db/*.cache pftt-reports/* pulls/config.php +shared/ diff --git a/pulls/index.php b/pulls/index.php index 6a5bef8..1cfffec 100644 --- a/pulls/index.php +++ b/pulls/index.php @@ -84,12 +84,13 @@ common_header(); </script> <script id="pullInstructionTemplate" type="text/x-jquery-tmpl"> <pre> -$ git fetch git://github.com/php/{{=repo}} pull/{{=number}}/head:pull-request/{{=number}} -$ git log -p pull-request/{{=number}} # REVIEW IT -$ git merge pull-request/{{=number}} # Merge it, add a GOOD commit message -$ make test # you better not forget that -$ git push origin master # everything okay? good, let's push it +$ git checkout master +$ wget https://github.com/php/{{=repo}}/pull/{{=number}}.patch # Download it +$ git am -3 {{=number}}.patch # Merge it with a GOOD commit message +$ make test # you better not forget that +$ git push origin master # everything okay? good, let's push it </pre> + <p>For a full detailed steps in how to merge into lower branches, check <a href="https://wiki.php.net/vcs/gitworkflow#reviewing_and_closing_pull_requests">our Git Workflow.</a></p> </script> <script id="labelsDialogTemplate" type="text/x-jquery-tmpl"> <dd></dd> @@ -167,4 +168,3 @@ $JS = array( ); common_footer($JS); -