Viewing 7 posts - 1 through 7 (of 7 total)
  • Author
    Posts
  • #35223

    zkab
    Participant

    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.

    From https://github.com/Dan-in-CA/OSPi

    + 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

    Auto-merging urls.py

    CONFLICT (content): Merge conflict in urls.py

    Removing templates/schedule.html

    Auto-merging templates/programs.html

    CONFLICT (content): Merge conflict in templates/programs.html

    Auto-merging templates/home.html

    CONFLICT (content): Merge conflict in templates/home.html

    Auto-merging static/themes/basic/base.css

    CONFLICT (content): Merge conflict in static/themes/basic/base.css

    Auto-merging static/scripts/schedule.js

    CONFLICT (content): Merge conflict in static/scripts/schedule.js

    Auto-merging plugins/weather_adj.py

    CONFLICT (content): Merge conflict in plugins/weather_adj.py

    Auto-merging plugins/mobile_app.py

    CONFLICT (content): Merge conflict in plugins/mobile_app.py

    Auto-merging ospi.py

    CONFLICT (content): Merge conflict in ospi.py

    Removing data/snames.json

    Removing data/options.txt

    Removing data/meta.txt

    Removing data/levels.json

    Removing data/.gitignore

    Removing LICENSE.md

    Removing .settings/.gitignore

    Removing .pydevproject.bak

    Removing .pydevproject

    Removing .project

    Automatic merge failed; fix conflicts and then commit the result.

    [email protected] ~/OSPi $

     

    #35227

    Samer
    Keymaster

    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.

    #35228

    Dan in CA
    Participant

    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.

    Dan

    #35230

    zkab
    Participant

    Thank guys – this is what I got …

     

    [email protected] ~/OSPi $ git reset –hard origin/master

    HEAD is now at aedec4a Fix translation markup of home.html.

    [email protected]-raspi ~/OSPi $ git pull

    Already up-to-date.

    [email protected] ~/OSPi $

     

    #35260

    Rudolph Terblanche
    Participant

    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.

    #35261

    Dan in CA
    Participant

    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.

    Dan

     

    #35283

    Rudolph Terblanche
    Participant

    Nice

Viewing 7 posts - 1 through 7 (of 7 total)
  • You must be logged in to reply to this topic.