Ask Your Question
0

user_navigation.html blocks askbot upgrade

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

Toms's avatar
767
Toms
asked 2012-09-26 15:00:47 -0600, updated 2012-09-30 10:33:03 -0600
edit flag offensive 0 remove flag close merge delete

Comments

add a comment see more comments

1 Answer

0

This is definitely an issue with the way you made the merge with git.

Also note that in the latest version we've moved templates to askbot/templates, media to askbot/media, we no longer have askbot/skins/default and askbot/skins/common, because the file paths to the templates and the media files were too long.

We'll be shipping only one theme bundled in the askbot app directory tree and any alternative themes will need to be stored in other directories.

Evgeny's avatar
13.2k
Evgeny
answered 2012-09-26 15:04:40 -0600, updated 2012-09-26 15:05:24 -0600
edit flag offensive 0 remove flag delete link
more

Comments

how to make it correctly? I usually use these commands:git fetch origin master:master-updated|| git checkout master|| git merge master-updated || python manage.py migrate || python manage.py collectstatic

Toms's avatar Toms (2012-09-27 01:52:47 -0600) edit
more
  • delete
add a comment see more comments