Updating WebODM over command line


#1

I’m having an issue with updating WebODM on my processing node. As far as I know, the processing node version doesn’t matter but I have been getting odd data and I fear I may be several versions behind since I can’t do my datasets on my normal PC. Here’s the console output.

kameron@SilverPancake:~/WebODM$ sudo bash webodm.sh update
Updating WebODM…
git pull origin master
remote: Enumerating objects: 174, done.
remote: Counting objects: 100% (174/174), done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 282 (delta 169), reused 168 (delta 167), pack-reused 108
Receiving objects: 100% (282/282), 119.60 KiB | 0 bytes/s, done.
Resolving deltas: 100% (189/189), completed with 52 local objects.
From https://github.com/OpenDroneMap/WebODM

  • branch master -> FETCH_HEAD
    10b4824…13d8d6a master -> origin/master
    Updating 10b4824…13d8d6a
    error: Your local changes to the following files would be overwritten by merge:
    app/models/task.py
    Please, commit your changes or stash them before you can merge.
    error: Your local changes to the following files would be overwritten by merge:
    package.json
    Please, commit your changes or stash them before you can merge.
    Aborting

#2

Mm, did you modify app/models/task.py? You can revert the changes before updating by issuing:

git checkout app/models/task.py`

Then ./webodm.sh update.


#3

That worked. I “made changes” by updating when there were tasks in the list. Perhaps for standard users that should be made part of the update procedure, maybe with a (y/n) style if you want to overwrite your data with the master data. I wasn’t trying to fiddle with the program, just trying to update the thing.