The github thing is easy, in the end.
Susan, after you pushed your changes to github
Open the github site with your branch
https://github.com/sottwell/evolution/tree/sottwell-dev
There is a button on the right called "Pull Request". On the following site you just have to send the pull request, the message box is for information, when you send an unrequested change of code.
That's it.
I take the pull request and merge it into the 1.1.dev branch, that is all I have to do.
The other way that the description said, is for developing in a team as organisation. I didn't start a new organisation for the Evo changes, because in this way, we can send the changes directly via a pull request back to the MODX repositories and all commits with the commit information stay intact.
The merger with the Japanese community should also go in this way, that is, why I asked yama to do all those changes together. We create a new branch on my sources and start to merge the changes of the Japanese community into this branch. This way we can test this changes, without touching the ongoing development.
After we got all that changes ready to go, we merge that 1.1.dev.japanese branch into the main 1.1.dev branch.
For those, who worked with Subversion: Branching and merging does work that easy with git. It is not such a PITA as in Subversion.
Then we should think about creating a community 1.1 Alpha version and pack it all together. At that point we should create pull request to the original sources.
@chucktrukk:
The shop was a job, I don't have any right to code. But it was database and application design. The articles where created in one MODX document by a snippet call, that called some classes, and so on.
For your interest, I've rewritten ezSQL to make PHP5 compatible, done unit tests, and created the class documentation with PHPDocument. I've send a pull request to the original repository, but haven't got an answer by today. You find that changes in a branch at
https://github.com/sjstoelting/ezSQL/tree/ezSQL-3.0.