84 lines
3.3 KiB
Plaintext
84 lines
3.3 KiB
Plaintext
================================================================================
|
|
操作类型: 提交并推送
|
|
开始时间: 2026-01-20 17:23:48
|
|
项目路径: E:/WorkSpace/MeowmentArt
|
|
================================================================================
|
|
|
|
[2026-01-20 17:23:48] [INFO] 日志: E:\WorkSpace\MeowmentArt\GitToolLog\提交并推送_20260120_172348.log
|
|
[2026-01-20 17:23:48] [INFO] 提交信息: 美术仓库初始化
|
|
[2026-01-20 17:23:48] [INFO] ============================================================
|
|
[2026-01-20 17:23:48] [INFO] 开始提交Art_SubModule
|
|
[2026-01-20 17:23:48] [INFO] ============================================================
|
|
[2026-01-20 17:23:48] [INFO]
|
|
步骤1: 检查改动
|
|
[2026-01-20 17:23:48] [INFO] 执行: git status --short
|
|
[2026-01-20 17:23:48] [INFO] D README.md
|
|
D README.md.meta
|
|
D "\346\265\213\350\257\2251.txt"
|
|
D "\346\265\213\350\257\2251.txt.meta"
|
|
?? HeadResource.prefab
|
|
?? HeadResource.prefab.meta
|
|
?? Scripts.meta
|
|
?? Scripts/
|
|
?? UISprites.meta
|
|
|
|
[2026-01-20 17:23:48] [INFO] 改动:
|
|
D README.md
|
|
D README.md.meta
|
|
D "\346\265\213\350\257\2251.txt"
|
|
D "\346\265\213\350\257\2251.txt.meta"
|
|
?? HeadResource.prefab
|
|
?? HeadResource.prefab.meta
|
|
?? Scripts.meta
|
|
?? Scripts/
|
|
?? UISprites.meta
|
|
|
|
[2026-01-20 17:23:48] [INFO]
|
|
步骤2: 添加改动
|
|
[2026-01-20 17:23:48] [INFO] 执行: git add .
|
|
[2026-01-20 17:23:48] [WARNING] warning: in the working copy of 'HeadResource.prefab', LF will be replaced by CRLF the next time Git touches it
|
|
warning: in the working copy of 'HeadResource.prefab.meta', LF will be replaced by CRLF the next time Git touches it
|
|
warning: in the working copy of 'Scripts.meta', LF will be replaced by CRLF the next time Git touches it
|
|
warning: in the working copy of 'Scripts/HeadResource.cs.meta', LF will be replaced by CRLF the next time Git touches it
|
|
warning: in the working copy of 'UISprites.meta', LF will be replaced by CRLF the next time Git touches it
|
|
|
|
[2026-01-20 17:23:48] [INFO]
|
|
步骤3: 提交
|
|
[2026-01-20 17:23:48] [INFO] 执行: git commit -m "美术仓库初始化"
|
|
[2026-01-20 17:23:48] [INFO] [detached HEAD dcd133c] 美术仓库初始化
|
|
8 files changed, 75 insertions(+), 4 deletions(-)
|
|
create mode 100644 HeadResource.prefab
|
|
rename README.md.meta => HeadResource.prefab.meta (62%)
|
|
delete mode 100644 README.md
|
|
rename "\346\265\213\350\257\2251.txt.meta" => Scripts.meta (57%)
|
|
create mode 100644 Scripts/HeadResource.cs
|
|
create mode 100644 Scripts/HeadResource.cs.meta
|
|
create mode 100644 UISprites.meta
|
|
delete mode 100644 "\346\265\213\350\257\2251.txt"
|
|
|
|
[2026-01-20 17:23:48] [INFO]
|
|
步骤4: Push前Pull
|
|
[2026-01-20 17:23:48] [INFO] 执行: git pull
|
|
[2026-01-20 17:23:49] [WARNING] You are not currently on a branch.
|
|
Please specify which branch you want to merge with.
|
|
See git-pull(1) for details.
|
|
|
|
git pull <remote> <branch>
|
|
|
|
|
|
[2026-01-20 17:23:49] [ERROR] Pull失败-存在冲突!
|
|
[2026-01-20 17:23:49] [ERROR] 解决方法:
|
|
1.打开Art_SubModule目录
|
|
2.解决冲突
|
|
3.git add .
|
|
4.git commit
|
|
5.重新提交
|
|
|
|
================================================================================
|
|
结束时间: 2026-01-20 17:24:05
|
|
执行结果: 失败
|
|
================================================================================
|
|
|
|
!!! 操作失败 !!!
|
|
日志文件: E:\WorkSpace\MeowmentArt\GitToolLog\提交并推送_20260120_172348.log
|