— clone the repo - will take a few minutes...This worked well and all was hunky dory. So, now I'd like to add modules, blocks, apply edits to tinyMCE config files and work with two developers on MyMoodle. So, here's what I think I need to do next:git clone git://dev.laptop.org/users/martin/moodle.git
— the "default" branch of this repo is for the moodle version we run in the OLPC School Server - not what you want - so create a local branch to track the mdl19-tinymce branch, and switch to itgit checkout -b mdl19-tinymce origin/mdl19-tinymce
— done! so configure and use... ... some time later...
— Pull updates from the mdl19-tinymce branchgit pull
— Now, I will be regularly merging fixes from MOODLE_19_STABLE so all you need to do is that "git pull" regularly. But perhaps I fall behind, or get rolled over by a bus. If that happens you can merge in updates from the MOODLE_19_STABLE branch without waiting for me...
— Setup a new 'remote' to track the MOODLE_19_BRANCH as imported by catalyst (you only need to do this step once)git remote add cat-moodle git://git.catalyst.net.nz/moodle-r2.git
— fetch latest code from the catalyst moodle repo (the first time this will take a minute)git fetch cat-moodle
— before attempting the merge, check that your status is "clean" so it's safe to later "reset" if the merge goes wrong...git status
— git will tell you about changed files and attempt the mergegit merge cat-moodle/MOODLE_19_STABLE
- list branches :
git branch
* mdl19-tinymce
mdl19-xs
- edit .gitconfig with personal details
- update :
git pull
- create new branch :
git branch ecs; git checkout ecs
- Now add modules, blocks, themes, etc :
git add path/to/mod
- Commit to branch:
git commit
- repeat add/commit process to hack on mymoodle code
- when debugged:
- return to main branch:
git branch mdl19-tinymce
- update :
git pull
- I'm not sure what I need to do at this point. I'd like to do an export of a merged ecs + current mdl19-tinymce branches to generate a codebase to use as production server.
- return to main branch:
The other question I'm not sure about is how to share this repository with two other developers.