GIT PULL problem btw 2.8.1 to 2.8.3 need help please

GIT PULL problem btw 2.8.1 to 2.8.3 need help please

by Chris P. -
Number of replies: 6

Hi all!

My first post here, even if I'm using this beautiful tool since 1y now  wink


OK my problem: being in Moodle 2.8.1.  My goal: update to 2.8.3

I've put Moodle in maintenance mode, backup directory, and also SQL.

Trying to 'GIT PULL', having an error (connection time out)

So reading another thread, I followed this one: GIT CLONE HTTPS://GITHUB.COM/MOODLE/MOODLE.GIT that didn't give me the expected result  (...it was a clone not a pull.. pff!)

Then I delete the newest MOODLE directory coming from CLONE command inside my current moodle one.

Then thanks to another thread I've done: GIT REMOTE SET-URL ORIGIN HTTPS://GITHUB.COM/MOODLE/MOODLE.GIT

Then a GIT PULL.


But having the errors:

Updating 21db825..8235b61

error: Your local changes to the following files would be overwritten by merge:

...a long list of files ....

error: The following untracked working tree files would be overwritten by merge:

...20 files appr....

Please move or remove them before you can merge.

Aborting


I don't want to make another mistake. How to solve?? 

Original MOODLE GIT is not working due to firewall conf, but now how can I recover my 2.8.3  (without deleting anything from my 2.8.1??)


A GIT STATUS give me:

# git status

# On branch MOODLE_28_STABLE

# Your branch is behind 'origin/MOODLE_28_STABLE' by 820 commits, and can be fast-forwarded.

#

# Changes not staged for commit:

#   (use "git add <file>..." to update what will be committed)

#   (use "git checkout -- <file>..." to discard changes in working directory)


Please help! Thanks in advance!! BR;

Average of ratings: -
In reply to Chris P.

Re: GIT PULL problem btw 2.8.1 to 2.8.3 need help please

by Chris P. -

Dear all,

Could you please tell me what command can I use to upgrade MOOODLE 2.8.1 -> 2.8.3 without breaking it ??  (given my previous post)


Thanks for your feedback & collaboration!

Average of ratings: -
In reply to Chris P.

Re: GIT PULL problem btw 2.8.1 to 2.8.3 need help please

by Visvanath Ratnaweera -
Picture of Particularly helpful Moodlers Picture of Translators
Just 'git pull' provided you followed https://docs.moodle.org/28/en/Git_for_Administrators when you downloaded.
Average of ratings: -
In reply to Visvanath Ratnaweera

Re: GIT PULL problem btw 2.8.1 to 2.8.3 need help please

by Chris P. -

Thanks for your feedback Visvanath


But as mentionned in my 1st post GIT PULL is not working...


But having the errors:

Updating 21db825..8235b61

error: Your local changes to the following files would be overwritten by merge:

...a long list of files ....

error: The following untracked working tree files would be overwritten by merge:

...20 files appr....

Please move or remove them before you can merge.

Aborting


I don't want to make another mistake. How to solve?? 

Original MOODLE GIT is not working due to firewall conf, but now how can I recover my 2.8.3  (without deleting anything from my 2.8.1??)


A GIT STATUS give me:

# git status

# On branch MOODLE_28_STABLE

# Your branch is behind 'origin/MOODLE_28_STABLE' by 820 commits, and can be fast-forwarded.

#

# Changes not staged for commit:

#   (use "git add <file>..." to update what will be committed)

#   (use "git checkout -- <file>..." to discard changes in working directory)


What do do now???  Any idea???

Average of ratings: -
In reply to Chris P.

Re: GIT PULL problem btw 2.8.1 to 2.8.3 need help please

by Visvanath Ratnaweera -
Picture of Particularly helpful Moodlers Picture of Translators
Hi

Sorry, I didn't read your first post carefully, noticing that it sounds too complicated for a novice. Well, I am not an experienced Git user, tackle these questions for my own learning.

Back to your problem, there seem to be two:
1. As the error messages clearly say, you have changed many files. Knowingly?

2. Firewall coming in between. Your network engineers must cooperate. If you start 'short circuiting' them with the help of outside network "re-engineers", a bigger disciplinary problem could be awaiting you!

BTW, if you are on Unix, it would be 'git pull', not 'GIT PULL'.
Average of ratings: -
In reply to Visvanath Ratnaweera

Re: GIT PULL problem btw 2.8.1 to 2.8.3 need help please

by Chris P. -

Thx for your feedback Visvanath !

In fast I didn't change anything about file system...  but I found a solution using other threads here and making a kind of melting pot, reading carefully & backuping before doing anything.  (just see my other post - it may be usefull for somebody else)

Kind regards.

Average of ratings: -
In reply to Chris P.

Re: GIT PULL problem btw 2.8.1 to 2.8.3 need help please

by Chris P. -

OK just to give my feedback if any other people having same trouble.

I've solved using:

git stash

then 

git pull

--> then moving all files listed from git answer in a temporary directory  (appr.20 files) normally you don't need it again but in case of....

then again

git pull


And now my 2.8.3+ website (formation sécurité informatique) is running fine! wink

Average of ratings: Useful (1)