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
1 Answer
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.
Comments
Reliable Askbot Hosting
Create your Q&A site at askbot.com. Managed Askbot hosting at just $15/mo. Dedicated hosting, support contracts, consulting services.
create your Q&A site30 days free trial
Stats
Asked: 2012-09-26 15:00:47 -0500
Seen: 82 times
Last updated: Sep 30 '12
