tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Removed 'release candidate branch' step of contributing.

Browse Source 
I don't know what that release candidate branch stuff is, but:

 * I've never seen any of the core team do it
 * I think it's overkill for most patches
 * I think it's being too prescriptive: if contributors want to do that, that's cool, but it doesn't affect the core team.
 * It makes our contributing guidelines more complex than they need to be.
This commit is contained in:
Sam Minnee 2012-10-09 12:36:18 +13:00
parent 439339d4fc
commit 433d29ce7b
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/en/misc/contributing/code.md
View File

@ -25,19 +25,16 @@ For other modules, our [module list on silverstripe.org](http://silverstripe.org
$ git checkout ###-description
$ git rebase master
1. When development is complete, rebase one more time, then branch from dev branch to release candidate branch.
$ git checkout ###-description
$ git branch ###-description-rc
$ git checkout ###-description-rc
1. Then [squash all commit related to a single issue into a single commit](code#squash-all-commits-related-to-a-single-issue-into-a-single-commit).
1. When development is complete, [squash all commit related to a single issue into a single commit](code#squash-all-commits-related-to-a-single-issue-into-a-single-commit).
$ git fetch upstream
$ git rebase -i upstream/master
1. Push release candidate branch to GitHub (`$ git push origin ###-description-rc`)
1. Issue pull request on GitHub (Click Pull Request button)
1. Push release candidate branch to GitHub
$ git push origin ###-description
1. Issue pull request on GitHub. Visit your forked respoistory on GitHub.com and click the "Create Pull Request" button nex tot the new branch.
The core team is then responsible for reviewing patches and deciding if they will make it into core. If
there are any problems they will follow up with you, so please ensure they have a way to contact you!