我试图从CKAN安装的源代码进行一次小升级。我们目前在Ubuntu 14.04的虚拟环境中运行CKAN 2.2。由于错误,我想将CKAN升级到2.5.2 版本
我遵循了建议的步骤:http://docs.ckan.org/en/latest/maintaining/upgrading/upgrade-source.html
git提取操作正常,给了我:
From https://github.com/ckan/ckan
* [new branch] 2.3.5-fix-solr-circleci -> origin/2.3.5-fix-solr-circleci
9b3c01b..d0c8505 2933-test-faster -> origin/2933-test-faster
b937f6a..e55dfca master -> origin/master
6bba236..29c9aa2 release-v2.3.4 -> origin/release-v2.3.4
* [new branch] release-v2.3.5 -> origin/release-v2.3.5
428c44e..7d2702f release-v2.4.3 -> origin/release-v2.4.3
* [new branch] release-v2.4.4 -> origin/release-v2.4.4
39a8901..1596665 release-v2.5.2 -> origin/release-v2.5.2
然而,运行checkout语句(gitcheckout版本v2.5.2)会导致以下错误:
error: Your local changes to the following files would be overwritten by checkout:
ckan/config/solr/schema.xml
ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
ckan/i18n/en_GB/LC_MESSAGES/ckan.po
Please, commit your changes or stash them before you can switch branches.
Aborting
我试着在网上找到解决方案,但不知道下一步该怎么办。我还尝试了以下命令(没有成功):
git checkout -- release-v2.5.2
sudo git checkout -- release-v2.5.2
sudo git checkout -- origin/release-v2.5.2
非常感谢任何手册或其他指针的链接!!
您需要运行命令git stash
来保存更改的文件的状态,执行git checkout
,然后执行git stash pop
来恢复更改的文件。