Revision history  [back]

I'm trying to upgrade my askbot installation, but during the process I get some warnings and after that the upgrade process aborts:

merge command:

git merge master-updated

result:

Updating 6fcfe25..1fb8a77
error: Your local changes to the following files would be overwritten by merge:
    askbot/skins/default/templates/widgets/user_navigation.html
Please, commit your changes or stash them before you can merge.
Aborting

I have already changed to the old version of user_navigation.html, but I still get this error. (The change was only a small string)

UPDATE:

I use these commands for updating and merging:

git fetch origin master:master-updated
git checkout master
git merge master-updated 
python manage.py migrate 
python manage.py collectstatic

Nevertheless it fails to merge