Created
September 2, 2014 09:51
-
-
Save gurbuzali/d54c54539f84bca33cb7 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Development Cycle: | |
| By starting today we're switching to a pull-request based development. Instead of pushing directly to main repo (github.com/hazelcast/hazelcast), everybody should push his bugfix/improvement/feature to his own git fork and send a pull request to merge with main repo. There will be no direct push to main repo branches. | |
| This requires everybody to work two separate remote repositories. First of all, everybody should have a fork of main repo in their own account (I guess nearly everybody has already a fork at the moment). If not, go to github.com/hazelcast/hazelcast and press the fork button (top rlght of the page). There may be lots of ways of working with multiple remote repos. I'll try to explain how I work, you can find an easier/comfortable way of your own.. | |
| Currently I (and most of you) already have a default remote named 'origin' for main repo. Add your own repo as another remote (You can list current remotes using: git remote -v); | |
| git remote add mdogan [email protected]:mdogan/hazelcast.git | |
| When working on a bugfix on 3.0 version; | |
| git checkout -b fix/3.0/issue-666 origin/maintenance-3.x | |
| OR if you have a local branch for maintenance-3.x | |
| git checkout -b fix/3.0/issue-666 maintenance-3.x | |
| OR | |
| git checkout maintenance-3.x | |
| git checkout -b fix/3.0/issue-666 | |
| ... work on fix.. commit fix.. then push your own repo; | |
| git push mdogan fix/3.0/issue-666 | |
| If you're working on a feature or improvement you can replace 'fix' prefix by 'feature' or 'improvement' or any keyword you like.. That's your own repo, give names whatever you wish.. | |
| After that you should browse github page of your fix branch; for example https://github.com/mdogan/hazelcast/tree/fix/3.0/issue-666, and send pull-request. For additional info see https://help.github.com/articles/using-pull-requests. | |
| Important note; If you're working on a bug fix, this fix should be committed to the both master and maintenance-3.x branches. | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment