January 15, 2015 at 6:25 am #35223
When updating with ‘git pull’ I get errors.
How can this be fixed ?
[email protected] ~/OSPi $ git pull
remote: Counting objects: 894, done.
remote: Compressing objects: 100% (363/363), done.
remote: Total 894 (delta 578), reused 821 (delta 521)
Receiving objects: 100% (894/894), 370.42 KiB | 237 KiB/s, done.
Resolving deltas: 100% (578/578), done.
+ ed45985…aedec4a master -> origin/master (forced update)
* [new branch] Blinker_test -> origin/Blinker_test
* [new branch] gh-pages -> origin/gh-pages
* [new branch] old_master -> origin/old_master
CONFLICT (content): Merge conflict in urls.py
CONFLICT (content): Merge conflict in templates/programs.html
CONFLICT (content): Merge conflict in templates/home.html
CONFLICT (content): Merge conflict in static/themes/basic/base.css
CONFLICT (content): Merge conflict in static/scripts/schedule.js
CONFLICT (content): Merge conflict in plugins/weather_adj.py
CONFLICT (content): Merge conflict in plugins/mobile_app.py
CONFLICT (content): Merge conflict in ospi.py
Automatic merge failed; fix conflicts and then commit the result.
[email protected] ~/OSPi $January 15, 2015 at 12:14 pm #35227
The way Dan manages the Github repo requires you to update using the following commands:
1) git checkout master
2) git fetch
3) git reset –hard origin/master
Hope that helps get things updated.January 15, 2015 at 12:18 pm #35228
Dan in CAParticipant
At the point where you have gotten the error you can just do “sudo git reset –hard origin/master” to fix the problem.
It is due to the nature of the update rather than how the repository is managed.
DanJanuary 15, 2015 at 12:47 pm #35230
zkabParticipantJanuary 20, 2015 at 10:07 am #35260
When are we getting a plugin we can run to do this ?
Think it would solve a lot of forum and support question to have this automated in some way.January 20, 2015 at 12:14 pm #35261
Dan in CAParticipant
There actually is one in the plugins directory, disabled by default.
You can enable it with:
sudo chmod +x OSPi/plugins/system_update.py
But it only does a git pull and will not handle this situation. It will be easy to fix.
I am currently working on a new plugin management system that will make things a lot easier. I will include an updated rev of the system updater when that is released. Hopefully within the next couple of weeks.
DanJanuary 22, 2015 at 7:07 am #35283
- You must be logged in to reply to this topic.