|
|
| Author | Topic: Git pull problem |
roselewis
Registered User
Registered:
6/20/2022 | posted: 6/23/2022 at 7:37:01 PM ET
I recently upgraded my installation from 1.9 to 2.4 using git as per the instructions on the git install page. The installation is a new one - not an upgrade. Today I attempted my first git pull from inside moodle in order to upgrade the code base. The procedure gave the following results:
git pull
remote: Counting objects: 10954, done.
remote: Compressing objects: 100% (1770/1770), done.
remote: Total 7302 (delta 5425), reused 7073 (delta 5266)
Receiving objects: 100% (7302/7302), 2.66 MiB | 1.33 MiB/s, done.
Resolving deltas: 100% (5425/5425), completed with 1081 local objects.
From git://git.moodle.org/moodle
d298661..e038687 MOODLE_24_STABLE -> origin/MOODLE_24_STABLE
3d1141b..572729a MOODLE_19_STABLE -> origin/MOODLE_19_STABLE
6c33f39..c9b28fc MOODLE_22_STABLE -> origin/MOODLE_22_STABLE
dd8e2dd..f0d8c53 MOODLE_23_STABLE -> origin/MOODLE_23_STABLE
* [new branch] MOODLE_25_STABLE -> origin/MOODLE_25_STABLE
3a8c438..e2637d1 master -> origin/master
* [new tag] v2.2.10 -> v2.2.10
* [new tag] v2.3.7 -> v2.3.7
* [new tag] v2.4.4 -> v2.4.4
* [new tag] v2.5.0 -> v2.5.0
From git://git.moodle.org/moodle
* [new tag] v2.5.0-rc1 -> v2.5.0-rc1
Updating d298661..e038687
error: Your local changes to the following files would be overwritten by merge:
...lots of files
mod/scorm/report/interactions/lang/en/scormreport_interactions.php
mod/scor
Aborting
Updates were rejected because the tip of your current branch is behind
Can anyone advise what I should do now in order to update the code? Thanks.
|
|
Do you think this topic is inappropriate? Vote it down. After a thread receives a certain amount of negative votes it will be automatically locked.
Please contact us with any concerns you might have.
|
