使用git更新代码遇到的问题

最新推荐文章于 2023-12-27 10:44:42 发布
最新推荐文章于 2023-12-27 10:44:42 发布
阅读量1.7k 收藏
点赞数
CC 4.0 BY-SA版权
分类专栏： git
版权声明：本文为博主原创文章，遵循 CC 4.0 BY-SA 版权协议，转载请附上原文出处链接和本声明。
本文链接：https://blog.youkuaiyun.com/baidu_35080512/article/details/82764887
本文记录了一次在Unity项目中使用Git进行版本控制时遇到的文件冲突问题及解决过程。详细展示了冲突出现的情况，包括被修改和未跟踪的文件，并通过执行特定的Git命令清除了这些冲突。

摘要生成于 C知道 ，由 DeepSeek-R1 满血版支持， 前往体验 >

9624@DESKTOP-RCIPNUP MINGW64 ~/Project (master)
$ git init
Reinitialized existing Git repository in C:/Users/9624/Project/.git/

9624@DESKTOP-RCIPNUP MINGW64 ~/Project (master)
$ cd KanTuCaiChengYu

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
        modified:   Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
        modified:   Library/ScriptAssemblies/Assembly-CSharp.dll
        modified:   Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
        modified:   Library/ScriptAssemblies/BuiltinAssemblies.stamp
        modified:   Library/assetDatabase3
        modified:   Library/metadata/00/00000000000000002000000000000000
        modified:   Library/metadata/00/00000000000000003000000000000000
        modified:   Library/metadata/00/00000000000000004000000000000000
        modified:   Library/metadata/00/00000000000000004100000000000000
        modified:   Library/metadata/00/00000000000000005000000000000000
        modified:   Library/metadata/00/00000000000000005100000000000000
        modified:   Library/metadata/00/00000000000000006000000000000000
        modified:   Library/metadata/00/00000000000000006100000000000000
        modified:   Library/metadata/00/00000000000000007000000000000000
        modified:   Library/metadata/00/00000000000000007100000000000000
        modified:   Library/metadata/00/00000000000000008000000000000000
        modified:   Library/metadata/00/00000000000000008100000000000000
        modified:   Library/metadata/00/00000000000000009000000000000000
        modified:   Library/metadata/00/0000000000000000a000000000000000
        modified:   Library/metadata/00/0000000000000000a100000000000000
        modified:   Library/metadata/00/0000000000000000b000000000000000
        modified:   Library/metadata/00/0000000000000000c000000000000000
        modified:   Library/shadercompiler-UnityShaderCompiler.exe0.log

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        ProjectSettings/
        Temp/

no changes added to commit (use "git add" and/or "git commit -a")

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull
remote: Enumerating objects: 148, done.
remote: Counting objects: 100% (148/148), done.
remote: Compressing objects: 100% (112/112), done.
remote: Total 115 (delta 84), reused 0 (delta 0)
Receiving objects: 100% (115/115), 252.76 KiB | 1.04 MiB/s, done.
Resolving deltas: 100% (84/84), completed with 28 local objects.
From https://gitee.com/9624/KanTuCaiChengYu
   6c9ec76..9fe9f31  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
        Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
        Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
        Library/ScriptAssemblies/Assembly-CSharp.dll
        Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
        Library/assetDatabase3
        Library/metadata/00/00000000000000002000000000000000
        Library/metadata/00/00000000000000003000000000000000
        Library/metadata/00/00000000000000004000000000000000
        Library/metadata/00/00000000000000004100000000000000
        Library/metadata/00/00000000000000005100000000000000
        Library/metadata/00/00000000000000006000000000000000
        Library/metadata/00/00000000000000006100000000000000
        Library/metadata/00/00000000000000007000000000000000
        Library/metadata/00/00000000000000007100000000000000
        Library/metadata/00/00000000000000008000000000000000
        Library/metadata/00/00000000000000008100000000000000
        Library/metadata/00/00000000000000009000000000000000
        Library/metadata/00/0000000000000000a000000000000000
        Library/metadata/00/0000000000000000a100000000000000
        Library/metadata/00/0000000000000000b000000000000000
        Library/metadata/00/0000000000000000c000000000000000
        Library/shadercompiler-UnityShaderCompiler.exe0.log
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
        ProjectSettings/AudioManager.asset
        ProjectSettings/ClusterInputManager.asset
        ProjectSettings/DynamicsManager.asset
        ProjectSettings/EditorBuildSettings.asset
        ProjectSettings/EditorSettings.asset
        ProjectSettings/GraphicsSettings.asset
        ProjectSettings/InputManager.asset
        ProjectSettings/NavMeshAreas.asset
        ProjectSettings/NetworkManager.asset
        ProjectSettings/Physics2DSettings.asset
        ProjectSettings/ProjectSettings.asset
        ProjectSettings/ProjectVersion.txt
        ProjectSettings/QualitySettings.asset
        ProjectSettings/TagManager.asset
        ProjectSettings/TimeManager.asset
        ProjectSettings/UnityAdsSettings.asset
        ProjectSettings/UnityConnectSettings.asset
Please move or remove them before you merge.
Aborting
Updating 6c9ec76..9fe9f31

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git fetch

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull
error: Your local changes to the following files would be overwritten by merge:
        Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
        Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
        Library/ScriptAssemblies/Assembly-CSharp.dll
        Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
        Library/assetDatabase3
        Library/metadata/00/00000000000000002000000000000000
        Library/metadata/00/00000000000000003000000000000000
        Library/metadata/00/00000000000000004000000000000000
        Library/metadata/00/00000000000000004100000000000000
        Library/metadata/00/00000000000000005100000000000000
        Library/metadata/00/00000000000000006000000000000000
        Library/metadata/00/00000000000000006100000000000000
        Library/metadata/00/00000000000000007000000000000000
        Library/metadata/00/00000000000000007100000000000000
        Library/metadata/00/00000000000000008000000000000000
        Library/metadata/00/00000000000000008100000000000000
        Library/metadata/00/00000000000000009000000000000000
        Library/metadata/00/0000000000000000a000000000000000
        Library/metadata/00/0000000000000000a100000000000000
        Library/metadata/00/0000000000000000b000000000000000
        Library/metadata/00/0000000000000000c000000000000000
        Library/shadercompiler-UnityShaderCompiler.exe0.log
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
        ProjectSettings/AudioManager.asset
        ProjectSettings/ClusterInputManager.asset
        ProjectSettings/DynamicsManager.asset
        ProjectSettings/EditorBuildSettings.asset
        ProjectSettings/EditorSettings.asset
        ProjectSettings/GraphicsSettings.asset
        ProjectSettings/InputManager.asset
        ProjectSettings/NavMeshAreas.asset
        ProjectSettings/NetworkManager.asset
        ProjectSettings/Physics2DSettings.asset
        ProjectSettings/ProjectSettings.asset
        ProjectSettings/ProjectVersion.txt
        ProjectSettings/QualitySettings.asset
        ProjectSettings/TagManager.asset
        ProjectSettings/TimeManager.asset
        ProjectSettings/UnityAdsSettings.asset
        ProjectSettings/UnityConnectSettings.asset
Please move or remove them before you merge.
Aborting
Updating 6c9ec76..9fe9f31

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git fetch origin

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull --no-ff
error: Your local changes to the following files would be overwritten by merge:
        Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
        Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
        Library/ScriptAssemblies/Assembly-CSharp.dll
        Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
        Library/assetDatabase3
        Library/metadata/00/00000000000000002000000000000000
        Library/metadata/00/00000000000000003000000000000000
        Library/metadata/00/00000000000000004000000000000000
        Library/metadata/00/00000000000000004100000000000000
        Library/metadata/00/00000000000000005100000000000000
        Library/metadata/00/00000000000000006000000000000000
        Library/metadata/00/00000000000000006100000000000000
        Library/metadata/00/00000000000000007000000000000000
        Library/metadata/00/00000000000000007100000000000000
        Library/metadata/00/00000000000000008000000000000000
        Library/metadata/00/00000000000000008100000000000000
        Library/metadata/00/00000000000000009000000000000000
        Library/metadata/00/0000000000000000a000000000000000
        Library/metadata/00/0000000000000000a100000000000000
        Library/metadata/00/0000000000000000b000000000000000
        Library/metadata/00/0000000000000000c000000000000000
        Library/shadercompiler-UnityShaderCompiler.exe0.log
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
        ProjectSettings/AudioManager.asset
        ProjectSettings/ClusterInputManager.asset
        ProjectSettings/DynamicsManager.asset
        ProjectSettings/EditorBuildSettings.asset
        ProjectSettings/EditorSettings.asset
        ProjectSettings/GraphicsSettings.asset
        ProjectSettings/InputManager.asset
        ProjectSettings/NavMeshAreas.asset
        ProjectSettings/NetworkManager.asset
        ProjectSettings/Physics2DSettings.asset
        ProjectSettings/ProjectSettings.asset
        ProjectSettings/ProjectVersion.txt
        ProjectSettings/QualitySettings.asset
        ProjectSettings/TagManager.asset
        ProjectSettings/TimeManager.asset
        ProjectSettings/UnityAdsSettings.asset
        ProjectSettings/UnityConnectSettings.asset
Please move or remove them before you merge.
Aborting

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ ^C

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull --no-ff
error: Your local changes to the following files would be overwritten by merge:
        Library/CurrentLayout.dwlt
        Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
        Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
        Library/ScriptAssemblies/Assembly-CSharp.dll
        Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
        Library/assetDatabase3
        Library/expandedItems
        Library/metadata/00/00000000000000002000000000000000
        Library/metadata/00/00000000000000003000000000000000
        Library/metadata/00/00000000000000004000000000000000
        Library/metadata/00/00000000000000004100000000000000
        Library/metadata/00/00000000000000005100000000000000
        Library/metadata/00/00000000000000006000000000000000
        Library/metadata/00/00000000000000006100000000000000
        Library/metadata/00/00000000000000007000000000000000
        Library/metadata/00/00000000000000007100000000000000
        Library/metadata/00/00000000000000008000000000000000
        Library/metadata/00/00000000000000008100000000000000
        Library/metadata/00/00000000000000009000000000000000
        Library/metadata/00/0000000000000000a000000000000000
        Library/metadata/00/0000000000000000a100000000000000
        Library/metadata/00/0000000000000000b000000000000000
        Library/metadata/00/0000000000000000c000000000000000
        Library/shadercompiler-UnityShaderCompiler.exe0.log
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
        Library/ProjectSettings.asset
        ProjectSettings/AudioManager.asset
        ProjectSettings/ClusterInputManager.asset
        ProjectSettings/DynamicsManager.asset
        ProjectSettings/EditorBuildSettings.asset
        ProjectSettings/EditorSettings.asset
        ProjectSettings/GraphicsSettings.asset
        ProjectSettings/InputManager.asset
        ProjectSettings/NavMeshAreas.asset
        ProjectSettings/NetworkManager.asset
        ProjectSettings/Physics2DSettings.asset
        ProjectSettings/ProjectSettings.asset
        ProjectSettings/ProjectVersion.txt
        ProjectSettings/QualitySettings.asset
        ProjectSettings/TagManager.asset
        ProjectSettings/TimeManager.asset
        ProjectSettings/UnityAdsSettings.asset
        ProjectSettings/UnityConnectSettings.asset
Please move or remove them before you merge.
Aborting

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git clean -d -f
Removing Assets/Scripts/Font/
Removing Assets/plugins/
Removing Library/ProjectSettings.asset
Removing Library/metadata/32/
Removing Library/metadata/38/
Removing Library/metadata/4a/
Removing Library/metadata/4f/
Removing Library/metadata/58/
Removing ProjectSettings/

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull origin master
From https://gitee.com/9624/KanTuCaiChengYu
 * branch            master     -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
        Library/CurrentLayout.dwlt
        Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
        Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
        Library/ScriptAssemblies/Assembly-CSharp.dll
        Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
        Library/assetDatabase3
        Library/expandedItems
        Library/metadata/00/00000000000000002000000000000000
        Library/metadata/00/00000000000000003000000000000000
        Library/metadata/00/00000000000000004000000000000000
        Library/metadata/00/00000000000000004100000000000000
        Library/metadata/00/00000000000000005100000000000000
        Library/metadata/00/00000000000000006000000000000000
        Library/metadata/00/00000000000000006100000000000000
        Library/metadata/00/00000000000000007000000000000000
        Library/metadata/00/00000000000000007100000000000000
        Library/metadata/00/00000000000000008000000000000000
        Library/metadata/00/00000000000000008100000000000000
        Library/metadata/00/00000000000000009000000000000000
        Library/metadata/00/0000000000000000a000000000000000
        Library/metadata/00/0000000000000000a100000000000000
        Library/metadata/00/0000000000000000b000000000000000
        Library/metadata/00/0000000000000000c000000000000000
        Library/shadercompiler-UnityShaderCompiler.exe0.log
Please commit your changes or stash them before you merge.
Aborting
Updating 6c9ec76..9fe9f31

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git reset --hard
HEAD is now at 6c9ec76 first

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull
error: Your local changes to the following files would be overwritten by merge:
        Library/CurrentLayout.dwlt
        Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
        Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
        Library/shadercompiler-UnityShaderCompiler.exe0.log
Please commit your changes or stash them before you merge.
Aborting
Updating 6c9ec76..9fe9f31

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git reset --hard
HEAD is now at 6c9ec76 first

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull <br><br><br><br><br><br>
bash: syntax error near unexpected token `<'

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull origin master
From https://gitee.com/9624/KanTuCaiChengYu
 * branch            master     -> FETCH_HEAD
Updating 6c9ec76..9fe9f31
Fast-forward
 .vs/KanTuCaiChengYu/v14/.suo                       | Bin 0 -> 27648 bytes
 Assets/Resources/chengyu/prefabs/TypeItem.prefab   | Bin 0 -> 15764 bytes
 .../Resources/chengyu/prefabs/TypeItem.prefab.meta |   8 +
 Assets/Resources/chengyu/prefabs/answerItem.prefab | Bin 0 -> 16444 bytes
 .../chengyu/prefabs/answerItem.prefab.meta         |   8 +
 Assets/Resources/config/typePanel.csv              | Bin 0 -> 10210 bytes
 Assets/Resources/config/typePanel.csv.meta         |   8 +
 Assets/Scene/chengyu.unity                         | Bin 129532 -> 141876 bytes
 Assets/Scripts/chengyu/LevelPanelManager.cs        |  31 +++
 Assets/Scripts/chengyu/LevelPanelManager.cs.meta   |  12 +
 Assets/Scripts/chengyu/MainPanelManager.cs         |  33 ++-
 Assets/Scripts/chengyu/chengyuManager.cs           | 153 +++++++++--
 KanTuCaiChengYu.CSharp.Editor.csproj               | 262 +++++++++++++++++++
 KanTuCaiChengYu.CSharp.csproj                      | 269 +++++++++++++++++++
 KanTuCaiChengYu.sln                                |  26 ++
 Library/CurrentLayout.dwlt                         | Bin 38972 -> 39044 bytes
 Library/InspectorExpandedItems.asset               | Bin 4664 -> 4664 bytes
 Library/ProjectSettings.asset                      | Bin 0 -> 37201 bytes
 .../ScriptAssemblies/Assembly-CSharp-Editor.dll    | Bin 310784 -> 310784 bytes
 .../Assembly-CSharp-Editor.dll.mdb                 | Bin 101541 -> 99976 bytes
 Library/ScriptAssemblies/Assembly-CSharp.dll       | Bin 387072 -> 388608 bytes
 Library/ScriptAssemblies/Assembly-CSharp.dll.mdb   | Bin 165498 -> 163850 bytes
 Library/assetDatabase3                             | Bin 1902632 -> 1903964 bytes
 Library/expandedItems                              | Bin 4404 -> 4764 bytes
 .../metadata/00/00000000000000002000000000000000   | Bin 4321 -> 4321 bytes
 .../metadata/00/00000000000000003000000000000000   | Bin 4313 -> 4313 bytes
 .../metadata/00/00000000000000004000000000000000   | Bin 4325 -> 4325 bytes
 .../metadata/00/00000000000000004100000000000000   | Bin 4321 -> 4321 bytes
 .../metadata/00/00000000000000005100000000000000   | Bin 4329 -> 4329 bytes
 .../metadata/00/00000000000000006000000000000000   | Bin 4321 -> 4321 bytes
 .../metadata/00/00000000000000006100000000000000   | Bin 4325 -> 4325 bytes
 .../metadata/00/00000000000000007000000000000000   | Bin 4321 -> 4321 bytes
 .../metadata/00/00000000000000007100000000000000   | Bin 4337 -> 4337 bytes
 .../metadata/00/00000000000000008000000000000000   | Bin 4325 -> 4325 bytes
 .../metadata/00/00000000000000008100000000000000   | Bin 4325 -> 4325 bytes
 .../metadata/00/00000000000000009000000000000000   | Bin 4325 -> 4325 bytes
 .../metadata/00/0000000000000000a000000000000000   | Bin 4325 -> 4325 bytes
 .../metadata/00/0000000000000000a100000000000000   | Bin 4337 -> 4337 bytes
 .../metadata/00/0000000000000000b000000000000000   | Bin 4337 -> 4337 bytes
 .../metadata/00/0000000000000000c000000000000000   | Bin 4325 -> 4325 bytes
 .../metadata/05/052d5486bc8058241be83db49f7d9c12   | Bin 0 -> 5233 bytes
 .../05/052d5486bc8058241be83db49f7d9c12.info       | Bin 0 -> 625 bytes
 .../metadata/1b/1b6f172e686d5cb4bbacda32e2e50bf5   | Bin 0 -> 14536 bytes
 .../1b/1b6f172e686d5cb4bbacda32e2e50bf5.info       | Bin 0 -> 592 bytes
 .../metadata/ad/adcc0648a89f2eb458e52ecebd06aa1a   | Bin 0 -> 4276 bytes
 .../ad/adcc0648a89f2eb458e52ecebd06aa1a.info       | Bin 0 -> 1172 bytes
 .../metadata/b0/b05fb7379fb67e940b4aee1f2c198909   | Bin 6537 -> 7317 bytes
 .../metadata/e6/e63ac16e139ff474d84c31c08622d2da   | Bin 0 -> 4284 bytes
 .../e6/e63ac16e139ff474d84c31c08622d2da.info       | Bin 0 -> 888 bytes
 .../metadata/e9/e9c4b5f50114d3f46a38611952659dec   | Bin 15405 -> 19153 bytes
 .../shadercompiler-UnityShaderCompiler.exe0.log    | 290 ---------------------
 ProjectSettings/AudioManager.asset                 | Bin 0 -> 4140 bytes
 ProjectSettings/ClusterInputManager.asset          | Bin 0 -> 4104 bytes
 ProjectSettings/DynamicsManager.asset              | Bin 0 -> 4276 bytes
 ProjectSettings/EditorBuildSettings.asset          | Bin 0 -> 4104 bytes
 ProjectSettings/EditorSettings.asset               | Bin 0 -> 4212 bytes
 ProjectSettings/GraphicsSettings.asset             | Bin 0 -> 4256 bytes
 ProjectSettings/InputManager.asset                 | Bin 0 -> 5520 bytes
 ProjectSettings/NavMeshAreas.asset                 | Bin 0 -> 4384 bytes
 ProjectSettings/NetworkManager.asset               | Bin 0 -> 4112 bytes
 ProjectSettings/Physics2DSettings.asset            | Bin 0 -> 4308 bytes
 ProjectSettings/ProjectSettings.asset              | Bin 0 -> 37201 bytes
 ProjectSettings/ProjectVersion.txt                 |   2 +
 ProjectSettings/QualitySettings.asset              | Bin 0 -> 5060 bytes
 ProjectSettings/TagManager.asset                   | Bin 0 -> 4324 bytes
 ProjectSettings/TimeManager.asset                  | Bin 0 -> 4112 bytes
 ProjectSettings/UnityAdsSettings.asset             | Bin 0 -> 4116 bytes
 ProjectSettings/UnityConnectSettings.asset         | Bin 0 -> 4116 bytes
 68 files changed, 783 insertions(+), 319 deletions(-)
 create mode 100644 .vs/KanTuCaiChengYu/v14/.suo
 create mode 100644 Assets/Resources/chengyu/prefabs/TypeItem.prefab
 create mode 100644 Assets/Resources/chengyu/prefabs/TypeItem.prefab.meta
 create mode 100644 Assets/Resources/chengyu/prefabs/answerItem.prefab
 create mode 100644 Assets/Resources/chengyu/prefabs/answerItem.prefab.meta
 create mode 100644 Assets/Resources/config/typePanel.csv
 create mode 100644 Assets/Resources/config/typePanel.csv.meta
 create mode 100644 Assets/Scripts/chengyu/LevelPanelManager.cs
 create mode 100644 Assets/Scripts/chengyu/LevelPanelManager.cs.meta
 create mode 100644 KanTuCaiChengYu.CSharp.Editor.csproj
 create mode 100644 KanTuCaiChengYu.CSharp.csproj
 create mode 100644 KanTuCaiChengYu.sln
 create mode 100644 Library/ProjectSettings.asset
 create mode 100644 Library/metadata/05/052d5486bc8058241be83db49f7d9c12
 create mode 100644 Library/metadata/05/052d5486bc8058241be83db49f7d9c12.info
 create mode 100644 Library/metadata/1b/1b6f172e686d5cb4bbacda32e2e50bf5
 create mode 100644 Library/metadata/1b/1b6f172e686d5cb4bbacda32e2e50bf5.info
 create mode 100644 Library/metadata/ad/adcc0648a89f2eb458e52ecebd06aa1a
 create mode 100644 Library/metadata/ad/adcc0648a89f2eb458e52ecebd06aa1a.info
 create mode 100644 Library/metadata/e6/e63ac16e139ff474d84c31c08622d2da
 create mode 100644 Library/metadata/e6/e63ac16e139ff474d84c31c08622d2da.info
 create mode 100644 ProjectSettings/AudioManager.asset
 create mode 100644 ProjectSettings/ClusterInputManager.asset
 create mode 100644 ProjectSettings/DynamicsManager.asset
 create mode 100644 ProjectSettings/EditorBuildSettings.asset
 create mode 100644 ProjectSettings/EditorSettings.asset
 create mode 100644 ProjectSettings/GraphicsSettings.asset
 create mode 100644 ProjectSettings/InputManager.asset
 create mode 100644 ProjectSettings/NavMeshAreas.asset
 create mode 100644 ProjectSettings/NetworkManager.asset
 create mode 100644 ProjectSettings/Physics2DSettings.asset
 create mode 100644 ProjectSettings/ProjectSettings.asset
 create mode 100644 ProjectSettings/ProjectVersion.txt
 create mode 100644 ProjectSettings/QualitySettings.asset
 create mode 100644 ProjectSettings/TagManager.asset
 create mode 100644 ProjectSettings/TimeManager.asset
 create mode 100644 ProjectSettings/UnityAdsSettings.asset
 create mode 100644 ProjectSettings/UnityConnectSettings.asset

9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$

 

idea中git更新代码到本地之后自己写的代码不见了.docx
06-10
在处理“idea中git更新代码到本地之后自己写的代码不见了”的问题时，首先需要理解Git的基本操作和IntelliJ IDEA中的Git设置。 Git是一种分布式版本控制系统，用于跟踪对文件和目录的修改。在IntelliJ IDEA中，Git...
IDEA中使用Git拉取代码时报 Git pull failed原因及解决方法
10-14
在使用IntelliJ IDEA（IDEA）进行Git操作时，可能会遇到“Git pull failed”的问题。这通常是由于本地代码有未提交的改动，且这些改动与远程仓库中的代码存在冲突导致的。Git的设计原则是避免自动合并可能引起冲突的...
error: src refspec master does not match any. 错误处理办法
weixin_30608131的博客
07-28 603
自从上次学了git之后，很少用。今天在使用 本地仓库使用如下命令初始化： $ git init 之后使用如下命令添加远程库： $ git remote add origin git@github.com:hahah/ftpmanage.git 然后使用 $ git push -u origin master 出现如下错误： error: src r...
git报错大全，你将要踩的坑我都帮你踩了系列
H-rosy的博客
02-10 1386
使用git常见的报错
git用法总结
谁家的喵
05-22 1730
git： 多人并行协作开发。同时修改一个函数，修改不一样，合并的时候遇到冲突怎办。不同人提交的修改就是分支，多个分支最后合并，通过版本管理，否则并行开发乱套了。 1. 概念 git概念示意图 repository，版本库：分为远程仓库和本地仓库，要管理的文件都放到仓库里。git init初始化后，会在当前目录生成一个.git目录，这个目录就是版本库 工作区，workspace：.git所在的目录就是工作区，一般时项目的根目录。注意：工作区不是指.git目录，是指.git位于的那个目录，比如.git位于not
error: The following untracked working tree files would be overwritten by merge:
weixin_46713695的博客
09-07 1万+
error: The following untracked working tree files would be overwritten by merge:
廖雪峰的git笔记（一）
南夏一木子的博客
11-06 1071
git是一个分布式版本控制系统 1、使用命令（适用于Ubuntu Linux或者Debian）： $ sudo apt-get install git 2、创建仓库，并且初始化它 $ mkdir gitTest # 创建仓库 $ git init # 初始化仓库 3、将文件添加到仓库中 $ git ad...
详解vscode使用git所遇到的坑
10-14
在使用Visual Studio Code (VSCode) 进行Git操作时，可能会遇到一些意想不到的问题，本文将深入探讨这些“坑”，并提供解决方案。首先，我们来看看配置Git时的一个常见误区。 在VSCode中集成Git功能，我们需要正确...
GIT分支代码统计
05-08
标签"GIT"表明了这个过程与Git紧密相关，"代码统计"指出了我们要量化的是代码的数量，而"脚本"则暗示了使用Shell脚本来自动化这个过程。压缩包中的`GitCount.sh`可能是整个流程的主控脚本，`Count_step1.sh`和`Count...
git上传代码简单方法 简单git上传代码工具
01-20
不过，理解基础的Git命令仍然是很重要的，因为这对于解决更复杂的代码冲突和协作问题至关重要。同时，使用图形化工具虽然方便，但可能无法覆盖所有Git的功能，所以在遇到特定情况时，仍需返回命令行进行操作。
当merge时出现error: The following untracked working tree files would be overwritten by merge
qq_41654729的博客
06-11 298
执行 git clean -d -fx 作用是：删除没有git add 的文件 本地的修改都会没有
Git报错：The following untracked working tree files would be overwritten by merge...
热门推荐
Lcmj01070806的博客
12-27 2万+
产生原因：工作区修改了代码，不打算提交，同步主干代码时，修改的代码与主干分支代码冲突，拉取主干分支代码就会报错。
git撤销与回滚
zzhongcy的专栏
01-14 390
    git的撤销与回滚在平时使用中还是比较多的，比如说我们想将某个修改后的文件撤销到上一个版本，或者是想撤销某次多余的提交，都要用到git的撤销和回滚操作。撤销分两种情况，一个是commit之前，一个是commit之后，下面具体看下这两种情况。   一.git commit之前         未添加到暂存区的撤销(没有git add)         添加进暂存区的撤销(git add...
hanges not staged for commit: (use “git add ＜file＞...“ to update what will be committed)
WJLcomeon的博客
02-18 5025
(use "git restore --staged <file>..." to unstage) new file: app/controller/cascade.ts new file: app/model/cascade.ts new file: app/router/cascade.ts new file: app/service/cascade.ts new file: app/validate/cascade.ts Changes not sta...
【Git】error: The following untracked working tree files would be overwritten by checkout
汽车-嵌入式-工作笔记-autosar
11-18 1万+
The following untracked working tree files would be overwritten by checkout
git pull 显示already up to date或者error
加油 (•̀ᴗ•́)و ̑̑
10-15 6621
git pull 显示already up to date 1. 可能是你上传的分支和pull的分支不一样 2. git checkout master #转到master分支 git pull 显示error: The following untracked working tree files would be overwritten by merge git stash 把自己的存起...
git 常用的几剂后悔药
Looking的博客
10-21 9796
将 git add 的文件变成 git add 之前的状态。 git restore --staged <filename> [looking@master GitTest]$ vim b.txt [looking@master GitTest]$ git add b.txt [looking@master GitTest]$ git status On branch master Your branch is up to date with 'origin/master'. Chang
git新增文件全流程
qq_39935684的博客
01-26 5717
1.从远程仓库克隆现有的仓库 git clone https://github.com/... PS E:\Python_project\gittest> git status On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean 2.新建文件后 ，git status状态 $ touch README PS E:\Python_
git push 失败问题如何解决
haifengbin1989的专栏
03-06 7020
问题：在修改完文件向github提交的时候，提交失败；由于之前直接在github上修改文件提交了一次，但是没有修改对，又再本地修改再次提交，就会失败，报如下错误： hfzhang@010YS-IT-00368 MINGW64 /d/JAVA-01/JAVA-01/Week_07 (main) $ git push origin To github.com:areyoucreazy/JAVA-01.git ! [rejected] main -> main (fetch first)
怎么使用git更新代码
最新发布
07-28
<think>我们正在讨论如何使用Git更新本地代码仓库。根据引用内容，更新本地代码通常涉及两个主要操作：拉取远程仓库的最新更改（pull）和将本地更改推送到远程仓库（push）。用户询问的是“更新本地代码”，因此重点应放在如何获取远程仓库的最新更改到本地。 根据引用[1]：“当远端仓库发生更新时，我们拉取下的代码仍然是原来的仓库代码，这时我们又要如何更新我们本地的代码呢？” 答案就是使用`git pull`命令。 引用[2]也提到：“push失败的话先将远程代码pull到本地再push。” 这说明了在推送之前先拉取远程更新以避免冲突的重要性。 引用[3]和[4]都提到了`git pull`命令的使用。 因此，更新本地代码仓库的基本步骤是： 1. 确保当前在正确的分支上（使用`git checkout <分支名>`切换分支，如果需要）。 2. 使用`git pull`命令从远程仓库拉取最新代码。 如果本地有未提交的更改，直接执行`git pull`可能会失败（因为拉取可能会覆盖本地更改）。因此，通常的做法是先提交或贮藏（stash）本地更改，然后再拉取。 步骤详细说明： 1. 检查当前状态：`git status` 查看是否有未提交的更改。 2. 如果有未提交的更改，可以选择： a. 提交更改：`git add .` 然后 `git commit -m "提交信息"` b. 或者贮藏更改（临时保存）：`git stash` 3. 拉取远程更新：`git pull origin <分支名>` （如果当前分支已经跟踪了远程分支，可以简写为`git pull`） 4. 如果之前贮藏了更改，现在可以恢复：`git stash pop`（这可能会产生冲突，需要手动解决） 如果本地没有未提交的更改，则直接执行第3步即可。 另外，引用[5]提到了强制覆盖远程仓库的方法（使用`git push --force`），但这通常用于覆盖远程仓库（而不是更新本地仓库），且需要谨慎使用，因为它会覆盖远程的历史记录。 所以，针对用户的问题“如何使用Git更新本地代码仓库”，核心步骤是使用`git pull`命令。 注意：在拉取之前，确保当前分支已经跟踪了远程分支。如果没有，需要指定远程仓库和分支。 示例： 1. 切换到要更新的分支：`git checkout main` 2. 拉取远程最新代码：`git pull origin main` 或者如果已经设置了上游分支，直接`git pull` 如果还没有设置远程仓库，需要先添加远程仓库（通常在克隆时已经设置）： - 查看远程仓库：`git remote -v` - 如果没有，添加远程仓库：`git remote add origin <远程仓库URL>` 总结步骤： 1. 确保在正确的分支上：`git checkout <你的分支>` 2. 拉取更新：`git pull` 如果遇到冲突，需要解决冲突后再提交。 最后，生成相关问题。</think>要使用 Git 更新本地代码仓库，主要涉及从远程仓库获取最新更改的操作。以下是详细步骤和注意事项： ### 🔄 更新本地代码的核心步骤 1. **切换到目标分支**（确保在需要更新的分支上操作）： ```bash git checkout main # 或你的分支名（如dev/master） ``` 2. **拉取远程更新**（核心操作）： ```bash git pull origin <分支名> # 示例：git pull origin main ``` - 自动合并远程最新代码到本地[^1][^2] - 等价于 `git fetch` + `git merge` 的组合操作 - 首次拉取需指定远程仓库：`git pull https://github.com/user/repo.git main` ### ⚠️ 常见场景处理 1. **本地无修改时**： ```bash git pull # 简写形式（当已设置上游分支跟踪） ``` 2. **本地有未提交修改时**： ```bash git stash # 暂存本地修改 git pull # 拉取更新 git stash pop # 恢复暂存内容（可能需手动解决冲突） ``` 3. **强制覆盖本地更改**（谨慎使用）： ```bash git reset --hard origin/main # 丢弃本地所有修改，强制与远程一致[^5] ``` ### 🛠️ 辅助操作 1. **查看更新状态**： ```bash git status # 检查更新后的状态 git log # 查看提交历史[^4] ``` 2. **设置上游分支**（简化后续操作）： ```bash git branch -u origin/main # 设置当前分支跟踪远程main分支 ``` ### 📌 关键注意事项 1. **冲突处理**： - 拉取时若提示冲突，需手动编辑冲突文件 - 解决后执行 `git add <文件>` 和 `git commit` 2. **分支一致性**： - 确保本地分支与远程分支同名 - 查看远程分支：`git branch -r` 3. **安全更新**： - 推荐先提交本地修改再拉取更新，避免覆盖工作[^2] - 定期运行 `git fetch` 查看远程变更（不自动合并） > 示例完整流程： > ```bash > git checkout dev > git stash # 可选（保存工作） > git pull origin dev > git stash pop # 可选（恢复工作） > git status # 验证更新 > ```
评论
添加红包

请填写红包祝福语或标题

个

红包个数最小为10个

元

红包金额最低5元

当前余额3.43元 前往充值 >
需支付：10.00元
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付元
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明：

1.余额是钱包充值的虚拟货币，按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载，可以购买VIP、付费专栏及课程。

余额充值