Slim PR workflow summary

README.md

Assumptions:

1. You have hub (https://github.com/github/hub) installed
2. You have your own fork of Slim as origin and have added slimphp/slim as a remote called upstream

Process:

1. Update:

    $ git checkout 4.x && git pull upstream 4.x
    $ git checkout 3.x && git pull upstream 3.x
   

2. Grab PR:

    $ hub checkout https://github.com/slimphp/Slim/pull/XXXX
   

   Review and test it!

3. If PR targets 3.x, merge to 3.x and 4.x:

    $ git checkout 3.x
    $ git merge --no-ff -
   

   Add Closes #XXXX to the commit message

    $ git checkout -
    $ git checkout 4.x
    $ git merge --no-ff -
   

   Add Forward port #XXXX to the commit message

4. If PR targets 4.x only:

    $ git checkout 4.x
    $ git merge --no-ff -
   

   Add Closes #XXXX to the commit message

5. Push:

    $ git push upstream 3.x:3.x && git push upstream 4.x:4.x
   

6. Delete the branch:

    $ git branch -d {branch name}
   

7. Go to the PR on GitHub and assign to the lowest numbered milestone that you can.