This is great… and I’m pretty sure this will increase the number of people inteseted in Yii… valuable contribution will begin very soon (if not started yet)
CeBe: Since you seem to be proficient with git/github: I’m currently creating a branch for every patch I’d like to submit via a pull request. Is that the right way to do? I fear to taint my pull requests with unrelated commits
I added a wiki page that outlines the workflow for git contributors, if you have any further questions please post them here and i’ll try and add the answers to the wiki page:
Yes it is definitively the right way, you should not commit anything to master since you would not be able to get new changes from upstream repository without creating unneccessary merge commits and spoil the history.
I also noticed that you did something like rebasing with your master branch, so there are commits authored by other people and committed by you. You should not use your master branch for creating branches for pull requests anymore.
Since github does not allow you to change history, I am afraid there is no way to fix this.
Google code bugtracker is deprecated, we only have github as the bugtracker now.
You should pull upstream before every push to github. As long as there are no merge conflicts before you open or update your pull request, you’ve done your job. If a long time passes because of discussion a member of the Yii team should attempt to resolve the merge conflicts themselves, if the merge is particularly tricky they will ask for your help. Of course you can be proactive about this and if you notice conflicts while a pull request is open, you can make the Yii team’s life easier by resolving them yourself.
Seen that. Unfortunately I can no longer follow this as my local git gave up on me. I can commit changes, but that will kick me out of my branch. Anyway, I think I hit my “damn you git!”-quota for this week. I’ll check back with this next wednesday.
