This forum post has been removed
Number of replies: 6Re: Upgrading Moodle 2.7 to Moodle 3 using Git - merge conflicts
Hi Mark
This may not be what you are looking for as going to be a harder process then you were thinking but if I understand the issues you are facing this may help.
Firstly Moodle itself will have changes between the two versions so trying to merge moodle 3.0 into your branch wont work, you will need to approach this a different way. You need to clone the 3.0 branch so that you have this branch in your git repository, once cloned you then need to branch of this so you could have your own 3.0 Stable branch. I would personally have my stable branch and then say have my main branch also.
Next once this is done you then need to move your own code onto your new branch as it seems all your code is tied into your live branch this is going to be the difficult part and may require some manual work depending on your branching structure. What I would recommend for future though would be having a core changes branch, a plugins branch, and a branch containing your custom code and then these can get merged into your new branch. That being said I have not tested the process fully so I would see what others come back with also. But if you get no more advice I hope this can point you in the right direction.
Thanks
Scott
This forum post has been removed
Re: Upgrading Moodle 2.7 to Moodle 3 using Git - merge conflicts
Hi Mark
You pretty much got the gist of what I was meaning, but have only been using moodle about 2 and a half years and git even less but hope this helps as it would give you the structure for progression. But if you find an easier or better way post it here as would be interested also.
What we do at present is we have 3 main branches our DEV, QA and Production we branch of the QA branch for any changes we make at all. We then test the changes locally on our new branch push this to the DEV branch for testing in our clone of the main site and then when happy that code is working it then goes to our QA branch which only gets work which has been signed off sent to it, Then we test it in the QA site and once passed there gets pushed to the production branch.
But for upgrading we have a document for all our core changes and the plugins and mods held separately. However I have been looking at how we could implement this for ourselves and the method I suggested is the one I will be suggesting.
Thanks
Scott
Re: Upgrading Moodle 2.7 to Moodle 3 using Git - merge conflicts
Here is how we do it at the OU http://tjhunt.blogspot.co.uk/2014/01/moving-ou-moodle-code-to-moodle-261.html
This forum post has been removed
Re: Upgrading Moodle 2.7 to Moodle 3 using Git - merge conflicts
Hi Mark,
This will not help your current issue. But we mostly use the workflow described in Andrew Nicols post here:
http://thamblings.blogspot.co.uk/2013/07/upgrading-moodle-from-git.html
We used this to upgrade from 2.4 to 2.6 to 2.8 to 3.0 with no issues.
We only have very minor core code changes but we have a lot of custom and third party plugins.