View source for Moodle Production Server with GIT

== GIT Repository scheme ==

This is the description of how we maintain our Moodle2 code at [http://www.isis.tu-berlin.de/2.0/ TU Berlin]. Our Moodle 1.9 has ca. 30000 active user with average 500 online user 24/7 (based on active users the last 15 minutes). This moves slowly to Moodle 2 now. We have a lot of code changes and plugins, so it's essential for us to maintain the code as automated as possible.

Our Moodle is called ISIS. So further on everything what is named ISIS belongs to us, everything what is called MOODLE belongs to moodle.org.

We use several GIT-repositories. The scheme with branches looks like this

[[File:ISIS_GIT_schema.png]]

The main purpose for the ISIS remote repository is for backups. One can imagine a scenario without this remote server only with local repositories involved. If you use [https://github.com/sitaramc/gitolite/wiki gitolite] for your remote repository, it's even more comfortable to keep the code clean, because you are able the restrict access to branches for developer and integration manager individually. 

The puzzle about the isis_rebase branch will be explained, when we come to a new moodle release.

== Install the repositories ==

We start with the original moodle code. For orientation we suggest to read the very useful description [[Git_for_Administrators]] first.
Instead of the advise there we won't clone the moodle.org-repository in the first place. We start over with creating an empty repository at the ISIS Integration server.


 <span style="color:#808080">wendt@integ:~$</span> mkdir isis
 <span style="color:#808080">wendt@integ:~$</span> cd isis/
 <span style="color:#808080">wendt@integ:~/isis$</span> git init
 Initialized empty Git repository in /home/wendt/isis/.git/
 <span style="color:#808080">wendt@integ:~/isis$</span> 


Now we add moodle.org as remote repository.

 <span style="color:#808080">wendt@integ:~/isis$</span> git remote add <span style="color:#008000">moodle</span> <nowiki>git://git.moodle.org/moodle.git</nowiki>
 <span style="color:#808080">wendt@integ:~/isis$</span> git fetch <span style="color:#008000">moodle</span>
 remote: Counting objects: 597378, done.
 remote: Compressing objects: 100% (141938/141938), done.
 remote: Total 597378 (delta 442383), reused 597378 (delta 442383)
 Receiving objects: 100% (597378/597378), 223.38 MiB | 11.16 MiB/s, done.
 Resolving deltas: 100% (442383/442383), done.
 From <nowiki>git://git.moodle.org/moodle</nowiki>
  * [new branch]      <span style="color:#ff0000">MOODLE_13_STABLE</span> -> <span style="color:#ff0000">moodle/MOODLE_13_STABLE</span>
  * [new branch]      <span style="color:#ff0000">MOODLE_22_STABLE</span> -> <span style="color:#ff0000">moodle/MOODLE_22_STABLE</span>
 .
 .
 .
  * [new branch]      <span style="color:#ff0000">MOODLE_23_STABLE</span> -> <span style="color:#ff0000">moodle/MOODLE_23_STABLE</span>
  * [new branch]      <span style="color:#ff0000">master</span>     -> <span style="color:#ff0000">moodle/master</span>
  * [new tag]         v1.3.5     -> v1.3.5
 .
 .
 . 
  * [new tag]         v2.3.2     -> v2.3.2
 <span style="color:#808080">wendt@integ:~/isis$</span> 


Next we create a local branch of the moodle 2.3 code.

 <span style="color:#808080">wendt@integ:~/isis$</span> git branch --track <span style="color:#ff0000">MOODLE_23_STABLE</span> <span style="color:#ff0000">remotes/moodle/MOODLE_23_STABLE</span>
 Branch <span style="color:#ff0000">MOODLE_23_STABLE</span> set up to track remote branch <span style="color:#ff0000">MOODLE_23_STABLE</span> from <span style="color:#008000">moodle</span>.
 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout <span style="color:#ff0000">MOODLE_23_STABLE</span>
 Switched to branch '<span style="color:#ff0000">MOODLE_23_STABLE</span>'
 <span style="color:#808080">wendt@integ:~/isis$</span>

From this we fork our initial ISIS code.

 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout -b <span style="color:#ff0000">isis_contrib</span>
 Switched to a new branch '<span style="color:#ff0000">isis_contrib</span>'
 <span style="color:#808080">wendt@integ:~/isis$</span> 


At this point we expect an empty ISIS remote repository, where we can initially push the ISIS code. First we add it as a remote repository to our local git-repository. then we push the isis_contrib branch into the different branches of the remote repository.


 <span style="color:#808080">wendt@integ:~/isis$</span> git remote add <span style="color:#008000">isis</span> <nowiki>git://isis.remote.tu-berlin.de/isis.git</nowiki>
 <span style="color:#808080">wendt@integ:~/isis$</span> git push <span style="color:#008000">isis</span> <span style="color:#ff0000">isis_contrib</span>:<span style="color:#ff0000">isis_contrib</span>
 Counting objects: 472320, done.
 Delta compression using up to 4 threads.
 Compressing objects: 100% (117914/117914), done.
 Writing objects: 100% (472320/472320), 199.01 MiB | 17.92 MiB/s, done.
 Total 472320 (delta 347911), reused 464510 (delta 342938)
 To <nowiki>git://isis.remote.tu-berlin.de/isis.git</nowiki>
  * [new branch]      <span style="color:#ff0000">isis_contrib</span> -> <span style="color:#ff0000">isis_contrib</span>
 <span style="color:#808080">wendt@integ:~/isis$</span> git push <span style="color:#008000">isis</span> <span style="color:#ff0000">isis_contrib</span>:<span style="color:#ff0000">isis_productive</span>
 Total 0 (delta 0), reused 0 (delta 0)
 To <nowiki>git://isis.remote.tu-berlin.de/isis.git</nowiki>
  * [new branch]      <span style="color:#ff0000">isis_contrib</span> -> <span style="color:#ff0000">isis_productive</span>
 <span style="color:#808080">wendt@integ:~/isis$</span> git push <span style="color:#008000">isis</span> <span style="color:#ff0000">isis_contrib</span>:<span style="color:#ff0000">isis_rebase</span>
 Total 0 (delta 0), reused 0 (delta 0)
 To <nowiki>git://isis.remote.tu-berlin.de/isis.git</nowiki>
  * [new branch]      <span style="color:#ff0000">isis_contrib</span> -> <span style="color:#ff0000">isis_rebase</span>
 <span style="color:#808080">wendt@integ:~/isis$</span> 

To stay in sync with the remote ISIS repository we track the remote branches to local ones now.

 <span style="color:#808080">wendt@integ:~/isis$</span> git branch --track <span style="color:#ff0000">isis_productive</span> <span style="color:#ff0000">remotes/isis/isis_productive</span>
 Branch <span style="color:#ff0000">isis_productive</span> set up to track remote branch <span style="color:#ff0000">isis_productive</span> from <span style="color:#008000">isis</span>.
 <span style="color:#808080">wendt@integ:~/isis$</span> git branch --track <span style="color:#ff0000">isis_rebase</span>  <span style="color:#ff0000">remotes/isis/isis_rebase</span>
 Branch <span style="color:#ff0000">isis_rebase</span> set up to track remote branch <span style="color:#ff0000">isis_rebase</span> from <span style="color:#008000">isis</span>.
 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout <span style="color:#ff0000">isis_contrib</span>
 Already on '<span style="color:#ff0000">isis_contrib</span>'
 <span style="color:#808080">wendt@integ:~/isis$</span> git branch --set-upstream <span style="color:#ff0000">remotes/isis/isis_contrib</span>
 Branch <span style="color:#ff0000">remotes/isis/isis_contrib</span> set up to track local branch <span style="color:#ff0000">isis_contrib</span>.
 <span style="color:#808080">wendt@integ:~/isis$</span> 

Now we are ready to bring the code to the productive Server. You can pull the code from the remote ISIS repository, but you will have a lot of overhead this way. So we simply rsync the code to the server.

 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout <span style="color:#ff0000">isis_productive</span>
 Switched to branch '<span style="color:#ff0000">isis_productive</span>'
 <span style="color:#808080">wendt@integ:~/isis$</span> cd ..
 <span style="color:#808080">wendt@integ:~$</span> rsync -a --delete --exclude=config.php --exclude=.htaccess --exclude=.git/ isis <nowiki>admin@www.isis.tu-berlin.de:/var/www/</nowiki>
 admin@www.isis.tu-berlin.de's password: 
 <span style="color:#808080">wendt@integ:~$</span> 

This rsync command will reappear later updating the production code as well. At this point you can start using your moodle and follow the [[Installing_Moodle|install procedure]] of moodle.


== Develop and change local code ==

Our developers clone the ISIS remote repository to their local home directories, prepare and test their changes and push the results back to <span style="color:#ff0000">isis_contrib</span> branch of the ISIS remote repository. 

 <span style="color:#808080">develop1@mylaptop:~$</span> git clone <nowiki>git://isis.remote.tu-berlin.de/isis.git</nowiki>
 Cloning into <span style="color:#008000">isis</span>...
 remote: Counting objects: 472320, done.
 remote: Compressing objects: 100% (112942/112942), done.
 remote: Total 472320 (delta 347910), reused 472320 (delta 347910)
 Receiving objects: 100% (472320/472320), 199.03 MiB | 23.88 MiB/s, done.
 Resolving deltas: 100% (347910/347910), done.
 warning: remote HEAD refers to nonexistent ref, unable to checkout.
 <span style="color:#808080">develop1@mylaptop:~$</span> 

To be aware of changes we track the remote <span style="color:#ff0000">isis_contrib</span> branch to a local branch. 

 <span style="color:#808080">develop1@mylaptop:~$</span> cd isis/
 <span style="color:#808080">develop1@mylaptop:~/isis$</span> git branch -av
   <span style="color:#ff0000">remotes/origin/isis_contrib</span>    562dbe4 weekly release 2.3.2+
   <span style="color:#ff0000">remotes/origin/isis_productive</span> 562dbe4 weekly release 2.3.2+
   <span style="color:#ff0000">remotes/origin/isis_rebase</span>     562dbe4 weekly release 2.3.2+
 <span style="color:#808080">develop1@mylaptop:~/isis$</span> git branch --track <span style="color:#ff0000">isis_contrib</span> <span style="color:#ff0000">remotes/origin/isis_contrib</span> 
 Branch <span style="color:#ff0000">isis_contrib</span> set up to track remote branch <span style="color:#ff0000">isis_contrib</span> from <span style="color:#008000">origin</span>.
 <span style="color:#808080">develop1@mylaptop:~/isis$</span> 

Lets fork a branch, where we put and test our code changes.

 <span style="color:#808080">develop1@mylaptop:~/isis$</span> git checkout <span style="color:#ff0000">isis_contrib</span> 
 Switched to branch '<span style="color:#ff0000">isis_contrib</span>'
 <span style="color:#808080">develop1@mylaptop:~/isis$</span> git checkout -b <span style="color:#ff0000">isis_my_code1</span>
 Switched to a new branch '<span style="color:#ff0000">isis_my_code1</span>'
 <span style="color:#808080">develop1@mylaptop:~/isis$</span> 

Make code changes.

 <span style="color:#808080">develop1@mylaptop:~/isis$</span> emacs theme/base/style/pagelayout.css 
 <span style="color:#808080">develop1@mylaptop:~/isis$</span> 

After commiting it, we can push it to the ISIS remote repository. Of course there are 1000 ways of using git to develop and change code and to push it to remote repositories. This is just one of it. Feel free to use, whatever you are used to.

 <span style="color:#808080">develop1@mylaptop:~/isis$</span> git commit -a -m "base theme updated"
 [<span style="color:#ff0000">isis_my_code1</span> b5ec6cc] base theme updated
  1 files changed, 1 insertions(+), 1 deletions(-)
 <span style="color:#808080">develop1@mylaptop:~/isis$</span> git push <span style="color:#008000">origin</span> <span style="color:#ff0000">isis_my_code1</span>:<span style="color:#ff0000">isis_contrib</span> 
 Counting objects: 11, done.
 Delta compression using up to 4 threads.
 Compressing objects: 100% (6/6), done.
 Writing objects: 100% (6/6), 511 bytes, done.
 Total 6 (delta 5), reused 0 (delta 0)
 To <nowiki>git://isis.remote.tu-berlin.de/isis.git</nowiki>
    562dbe4..b5ec6cc  <span style="color:#ff0000">isis_my_code1</span> -> <span style="color:#ff0000">isis_contrib</span>
 <span style="color:#808080">develop1@mylaptop:~/isis$</span>

Don't forget to update your <span style="color:#ff0000">isis_contrib</span> branch before the next code change.

 <span style="color:#808080">develop1@mylaptop:~/isis$</span> git checkout <span style="color:#ff0000">isis_contrib</span> 
 Switched to branch '<span style="color:#ff0000">isis_contrib</span>'
 Your branch is behind '<span style="color:#ff0000">origin/isis_contrib</span>' by 1 commit, and can be fast-forwarded.
 <span style="color:#808080">develop1@mylaptop:~/isis$</span> git pull
 Updating 562dbe4..b5ec6cc
 Fast-forward
  theme/base/style/pagelayout.css |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 <span style="color:#808080">develop1@mylaptop:~/isis$</span>

== Integrate code changes to productive ==

Back on the integration server, the integration manager has to review and test the new code contributions. So lets get the new code changes from the ISIS remote repository.

 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout <span style="color:#ff0000">isis_contrib</span> 
 Switched to branch '<span style="color:#ff0000">isis_contrib</span>'
 <span style="color:#808080">wendt@integ:~/isis$</span> git pull
 remote: Counting objects: 11, done.
 remote: Compressing objects: 100% (6/6), done.
 remote: Total 6 (delta 5), reused 0 (delta 0)
 Unpacking objects: 100% (6/6), done.
 From <nowiki>isis.remote.tu-berlin.de/isis</nowiki>
    562dbe4..b5ec6cc  <span style="color:#ff0000">isis_contrib</span> -> <span style="color:#ff0000">isis/isis_contrib</span>
 Updating 562dbe4..b5ec6cc
 Fast-forward
  theme/base/style/pagelayout.css |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 <span style="color:#808080">wendt@integ:~/isis$</span> 

If you go for the code changes, you can merge them into the production branch and cherry-pick it on top of the rebase branch. I prefer cherry-picking the code, because it gives more awareness of what I do. Although there exists more ways of merging the code on top of the <span style="color:#ff0000">isis_rebase</span>-branch.

 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout <span style="color:#ff0000">isis_productive</span> 
 Switched to branch '<span style="color:#ff0000">isis_productive</span>'
 <span style="color:#808080">wendt@integ:~/isis$</span> git merge <span style="color:#ff0000">isis_contrib</span> 
 Updating 562dbe4..b5ec6cc
 Fast-forward
  theme/base/style/pagelayout.css |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout <span style="color:#ff0000">isis_rebase</span> 
 Switched to branch '<span style="color:#ff0000">isis_rebase</span>'
 <span style="color:#808080">wendt@integ:~/isis$</span> git cherry-pick b5ec6cc
 Finished one cherry-pick.
 [isis_rebase ed9bd24] base theme updated
  1 files changed, 1 insertions(+), 1 deletions(-)
 <span style="color:#808080">wendt@integ:~/isis$</span> 

Now we push our changes to the ISIS remote repository.

 <span style="color:#808080">wendt@integ:~/isis$</span> git push
 Counting objects: 11, done.
 Delta compression using up to 4 threads.
 Compressing objects: 100% (6/6), done.
 Writing objects: 100% (6/6), 517 bytes, done.
 Total 6 (delta 5), reused 0 (delta 0)
 To <nowiki>git://isis.remote.tu-berlin.de/isis.git</nowiki>
    562dbe4..b5ec6cc  <span style="color:#ff0000">isis_productive</span> -> <span style="color:#ff0000">isis_productive</span>
    562dbe4..ed9bd24  <span style="color:#ff0000">isis_rebase</span> -> <span style="color:#ff0000">isis_rebase</span>
 <span style="color:#808080">wendt@integ:~/isis$</span>

And finally we apply the rsync again to copy the source code to the ISIS productive server. 

 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout <span style="color:#ff0000">isis_productive</span>
 Switched to branch '<span style="color:#ff0000">isis_productive</span>'
 <span style="color:#808080">wendt@integ:~/isis$</span> cd ..
 <span style="color:#808080">wendt@integ:~$</span> rsync -a --delete --exclude=config.php --exclude=.htaccess --exclude=.git/ isis <nowiki>admin@www.isis.tu-berlin.de:/var/www/</nowiki>
 admin@www.isis.tu-berlin.de's password: 
 <span style="color:#808080">wendt@integ:~$</span> 

== Merge the weekly moodle release ==

Now, having a working Moodle instance running at the Server, we have to merge the weekly Moodle releases, To be on the safe side, you can always fork new test branches and test the merging process there, before you apply these to your productive branches. After practising it for several month everything still merges smoothly without any conflicts.

First we get the recent Moodle release in our tracked Moodle-branch.

 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout <span style="color:#ff0000">MOODLE_23_STABLE</span> 
 Switched to branch '<span style="color:#ff0000">MOODLE_23_STABLE</span>'
 <span style="color:#808080">wendt@integ:~/isis$</span> git pull 
  remote: Counting objects: 4304, done.
  remote: Compressing objects: 100% (776/776), done.
  remote: Total 3014 (delta 2310), reused 2841 (delta 2155)
  Receiving objects: 100% (3014/3014), 733.24 KiB | 276 KiB/s, done.
  Resolving deltas: 100% (2310/2310), completed with 532 local objects.
  From <nowiki>git://git.moodle.org/moodle</nowiki>
    a8d6719..9fa159e  <span style="color:#ff0000">MOODLE_21_STABLE</span> -> <span style="color:#ff0000">moodle/MOODLE_21_STABLE</span>
    a8ce907..10c3c37  <span style="color:#ff0000">MOODLE_22_STABLE</span> -> <span style="color:#ff0000">moodle/MOODLE_22_STABLE</span>
    562dbe4..b1c5155  <span style="color:#ff0000">MOODLE_23_STABLE</span> -> <span style="color:#ff0000">moodle/MOODLE_23_STABLE</span>
    ccd90e7..7e8ae12  <span style="color:#ff0000">master</span>     -> <span style="color:#ff0000">moodle/master</span>
  Updating 562dbe4..b1c5155
  Fast-forward
   admin/cli/install.php                             |   14 +-
   admin/renderer.php                                |    2 +-
   admin/tool/customlang/locallib.php                |    2 +-
  .
  .
  .
   version.php                                       |    4 +-
   webservice/lib.php                                |    2 +-
  104 files changed, 2211 insertions(+), 1248 deletions(-)
  create mode 100644 install/lang/ms/admin.php
  create mode 100644 install/lang/ms/install.php
  create mode 100644 install/lang/ms/moodle.php
  delete mode 100644 mod/lesson/importppt.php
  delete mode 100644 mod/lesson/importpptlib.php
  create mode 100644 pix/f/epub.png
 <span style="color:#808080">wendt@integ:~/isis$</span> 

Now we merge the new release into our isis branches.

 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout <span style="color:#ff0000">isis_contrib</span> 
 Switched to branch '<span style="color:#ff0000">isis_contrib</span>'
 <span style="color:#808080">wendt@integ:~/isis$</span> git merge <span style="color:#ff0000">MOODLE_23_STABLE</span> 
 Removing mod/lesson/importppt.php
 Removing mod/lesson/importpptlib.php
 Merge made by recursive.
  admin/cli/install.php                             |   14 +-
  admin/renderer.php                                |    2 +-
  admin/tool/customlang/locallib.php                |    2 +-
  admin/tool/customlang/styles.css                  |    4 +
 .
 .
 .
  user/selector/search.php                          |   13 +-
  version.php                                       |    4 +-
  webservice/lib.php                                |    2 +-
  104 files changed, 2211 insertions(+), 1248 deletions(-)
  create mode 100644 install/lang/ms/admin.php
  create mode 100644 install/lang/ms/install.php
  create mode 100644 install/lang/ms/moodle.php
  delete mode 100644 mod/lesson/importppt.php
  delete mode 100644 mod/lesson/importpptlib.php
  create mode 100644 pix/f/epub.png
 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout <span style="color:#ff0000">isis_productive</span> 
 Switched to branch '<span style="color:#ff0000">isis_productive</span>'
 <span style="color:#808080">wendt@integ:~/isis$</span> git merge <span style="color:#ff0000">MOODLE_23_STABLE</span> 
 Removing mod/lesson/importppt.php
 Removing mod/lesson/importpptlib.php
 Merge made by recursive.
  admin/cli/install.php                             |   14 +-
  admin/renderer.php                                |    2 +-
 .
 .
 .  
  user/selector/search.php                          |   13 +-
  version.php                                       |    4 +-
  webservice/lib.php                                |    2 +-
  104 files changed, 2211 insertions(+), 1248 deletions(-)
  create mode 100644 install/lang/ms/admin.php
  create mode 100644 install/lang/ms/install.php
  create mode 100644 install/lang/ms/moodle.php
  delete mode 100644 mod/lesson/importppt.php
  delete mode 100644 mod/lesson/importpptlib.php
  create mode 100644 pix/f/epub.png
 <span style="color:#808080">wendt@integ:~/isis$</span> 

As the name suggests, we rebase our code changes from the <span style="color:#ff0000">isis_rebase</span> branch on top of the <span style="color:#ff0000">MOODLE_23_STABLE</span> branch.

 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout <span style="color:#ff0000">isis_rebase</span> 
 Switched to branch '<span style="color:#ff0000">isis_rebase</span>'
 <span style="color:#808080">wendt@integ:~/isis$</span> git rebase <span style="color:#ff0000">MOODLE_23_STABLE</span> 
 First, rewinding head to replay your work on top of it...
 Applying: base theme updated
 <span style="color:#808080">wendt@integ:~/isis$</span> 

Finally we push everything to the ISIS remote repository.

 <span style="color:#808080">wendt@integ:~/isis$</span> git push
 Counting objects: 1062, done.
 Delta compression using up to 4 threads.
 Compressing objects: 100% (159/159), done.
 Writing objects: 100% (661/661), 151.24 KiB, done.
 Total 661 (delta 501), reused 623 (delta 488)
 To <nowiki>git://isis.remote.tu-berlin.de/isis.git</nowiki>
    b5ec6cc..df8a1ca  <span style="color:#ff0000">isis_contrib</span> -> <span style="color:#ff0000">isis_contrib</span>
    b5ec6cc..7b75c8e  <span style="color:#ff0000">isis_productive</span> -> <span style="color:#ff0000">isis_productive</span>
  ! [rejected]        <span style="color:#ff0000">isis_rebase</span> -> <span style="color:#ff0000">isis_rebase</span> (non-fast-forward)
 error: failed to push some refs to '<nowiki>git://isis.remote.tu-berlin.de/isis.git</nowiki>'
 To prevent you from losing history, non-fast-forward updates were rejected
 Merge the remote changes (e.g. 'git pull') before pushing again.  See the
 'Note about fast-forwards' section of 'git push --help' for details.
 <span style="color:#808080">wendt@integ:~/isis$</span> 

Of course pushing the <span style="color:#ff0000">isis_rebase</span> branch fails, so we push it with force.

 <span style="color:#808080">wendt@integ:~/isis$</span> git push --force <span style="color:#008000">isis</span> <span style="color:#ff0000">isis_rebase</span>:<span style="color:#ff0000">isis_rebase</span>
 Counting objects: 11, done.
 Delta compression using up to 4 threads.
 Compressing objects: 100% (6/6), done.
 Writing objects: 100% (6/6), 515 bytes, done.
 Total 6 (delta 5), reused 0 (delta 0)
 To <nowiki>git://isis.remote.tu-berlin.de/isis.git</nowiki>
  + ed9bd24...eeeb43f <span style="color:#ff0000">isis_rebase</span> -> <span style="color:#ff0000">isis_rebase</span> (forced update)
 <span style="color:#808080">wendt@integ:~/isis$</span> 

== Rebase on new Moodle version ==

Because the developing branches of Moodle 2.4 are forked from Moodle 2.3.0 every merge from our recent productive branch with the new developing branch will fail because of conflicts. This is, why we collect all of our code changes on top of the <span style="color:#ff0000">isis_rebase</span> branch. Once a new Moodle-release is there, we can simply put our code changes again on top of this release and have hopefully less work with conflicts.

 <span style="color:#808080">wendt@integ:~/isis$</span> git branch -v
    <span style="color:#ff0000">MOODLE_23_STABLE</span>     e6aac11 weekly release 2.3.3+
    <span style="color:#ff0000">MOODLE_24_dev</span>        87e9331 weekly release 2.4dev
    <span style="color:#ff0000">isis_rebase</span>     6cc7e47 Ver-/Entschlüsselung der Backup-Archive @author: Jan Eberhardt, 10/08/2012
 <span style="color:#808080">wendt@integ:~/isis$</span> git checkout <span style="color:#ff0000">isis_rebase</span>
 <span style="color:#808080">wendt@integ:~/isis$</span> git rebase --onto <span style="color:#ff0000">MOODLE_24_dev MOODLE_23_STABLE isis_rebase</span>
 <span style="color:#808080">wendt@integ:~/isis$</span>
[[Category:Git]]
[[Category:Developer]]