logo
0
0
WeChat Login

运行后更新代码报错#1

Resolved
created 2 months ago
Edit
Edit history
From https://cnb.cool/Bring/Tools/IPLocation * branch            main       -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
	.gitattributes
Please commit your changes or stash them before you merge.
Aborting
Updating 9529f8a..0781645
git: 'symbolic_ref_short=main' is not a git command. See 'git --help'.
🔀 切换到分支: main
Already on 'main'
M	.gitattributes
Your branch is behind 'origin/main' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
🔄 Tue Jan 27 09:29:01 UTC 2026: 更新主分支代码...
From https://cnb.cool/Bring/Tools/IPLocation * branch            main       -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
	.gitattributes
Please commit your changes or stash them before you merge.
Aborting
Updating 9529f8a..0781645

检查 script/start.sh 的更新代码逻辑,修改为强制取远端的覆盖本地

运行后更新代码报错
fix: 使用 git reset 替代 git pull 来同步分支
Resolved ISSUE
referenced ISSUE
Assignee
None yet
Label
None yet
Priority
None yet
Time period
-
Property
Add custom properties to record and label key information
Participant