Comments (4)
是按照说明进行更新的吗?
from adachi-bot.
感谢回复!是的,按照说明进行更新。
~#@❯ ssh centos ❮
Last login: Fri Sep 3 10:35:31 2021 from 192.168.1.2
root@localhost: ~ 10:43:13
# cd Adachi-BOT/
root@localhost: ~/Adachi-BOT 10:43:18
# git stash push .
config/setting.yml: needs merge
src/plugins/tools/help.js: needs merge
root@localhost: ~/Adachi-BOT 10:43:18
# git pull -p
warning: 不建议在没有为偏离分支指定合并策略时执行 pull 操作。 您可以在执行下一次
pull 操作之前执行下面一条命令来抑制本消息:
git config pull.rebase false # 合并(缺省策略)
git config pull.rebase true # 变基
git config pull.ff only # 仅快进
您可以将 "git config" 替换为 "git config --global" 以便为所有仓库设置
缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase,
或者 --ff-only 参数覆盖缺省设置。
error: 无法拉取,因为您有未合并的文件。
提示:请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记
提示:解决方案并提交。
fatal: 因为存在未解决的冲突而退出。
root@localhost: ~/Adachi-BOT 10:43:22
#
from adachi-bot.
这可能是你本地修改之后已经提交了,只能手动解决冲突了,如果没有git add
,git stash
应该不会报错
from adachi-bot.
这可能是你本地修改之后已经提交了,只能手动解决冲突了,如果没有
git add
,git stash
应该不会报错
您这么一说我大概明白了,可能是之前在使用VS Code编辑时,不太熟悉vs git插件的界面,点到了类似git add的操作。我去学习一下git的使用方法,尝试解决一下该问题。
感谢解答!
from adachi-bot.
Related Issues (20)
- 版本3.7 HOT 15
- ver3.8 HOT 5
- 角色、武器信息的材料加个名字 HOT 3
- 3.2 版本 HOT 17
- 米游社接口报错: character id:10000070 is not exists HOT 2
- win启动报错 HOT 5
- 3.3 版本 HOT 10
- JS module CI failed HOT 2
- 解决 oicq 版本过低的问题 HOT 21
- 米游社域名换了 HOT 6
- 发不出群消息了 HOT 3
- 管理员指令没有效果 HOT 15
- 新法器名字 overflow
- 项目前端工程化 HOT 10
- 3.4 版本 HOT 4
- 米游社卡片草神瞳不用v-if了
- ver3.5 HOT 8
- 海哥裂了? HOT 10
- 扫码登陆失败 HOT 18
- new ver HOT 10
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from adachi-bot.