Making pull requests for the main Cappuccino fork

When you want to make a pull request that will end up in the main Cappuccino fork, follow these steps:

1. If you haven't already gotten the workflow scripts, download them, make them executable and put them in your PATH: scapp-start-topic, scapp-merge-topic, scapp-remove-topic, git-copy-commit-files
2. Execute scapp-start-topic <topic>. This will create and checkout a new branch based on upstream/master.
3. Make your changes in the topic branch. If your topic branch requires changes in slevenbits/master that are not yet in cappuccino/master, execute git-copy-commit-files <sha> for each commit that is missing. Do not add those files to the topic branch commits!
4. Test your branch, and when you are satisfied it is working correctly, execute scapp-merge-topic from the topic branch. When the script has done the first part of its magic, your browser will open to a new pull request page. Towards the top of the page, it will say "You're asking aljungberg to pull commits into aljungberg:master from slevenbits:master. Click on aljungberg:master.
5. In the left box that appears ("Base branch · tag · commit"), click on the popup menu and select "cappuccino/cappuccino", which should be the second item. Then click "Update Commit Range" on the right.
6. The number of "Commits" and "Files Changed" tabs should reflect only the commits you want to pull. Click on those tabs and confirm they are correct.
7. Fix up the pull request message if necessary, then click "Send Pull Request".
8. Once the pull request has been merged into Cappuccino, execute scapp-remove-topic <topic>.