butterfly主题更新升级问题 #1099
NAILIANGCHI
started this conversation in
General
butterfly主题更新升级问题
#1099
Replies: 1 comment 3 replies
-
|
...... 这是 git 的使用问题 不是主题 |
Beta Was this translation helpful? Give feedback.
3 replies
-
|
|
Beta Was this translation helpful? Give feedback.
-
|
你没处理合并冲突啊 |
Beta Was this translation helpful? Give feedback.
-
|
我看看git基础去吧😢 |
Beta Was this translation helpful? Give feedback.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
根据主题文档描述 新建一个'_config.butterfly.yml'文件将'_config.yml'内容复制到里面后，不用删除'_config.yml'文件，在主题文件下使用指令'git pull'更新。
但是会提示需要提交更改存储'_config.yml'文件，但是删除这个文件则会更新成功，但是会新建一个_config.yml得需要重新配置，_config.butterfly.yml为什么不会合并呢？
Beta Was this translation helpful? Give feedback.
All reactions