最新消息:雨落星辰是一个专注网站SEO优化、网站SEO诊断、搜索引擎研究、网络营销推广、网站策划运营及站长类的自媒体原创博客

Git "unresolved conflicts" when copied to different PC - Stack Overflow

programmeradmin1浏览0评论

i have a PC where i cannot clone to/push from.
I have a repository there, with some local branches and commits.
I figured i could copy the whole repository folder to a network-capable PC and push from there, but when i move it and i try to open it (with git-extensions) it says "there are unresolved merge conflicts" and shows no branches

calling git log returns

so what's going on there?
does git keep some absolute paths i need to manually edit?
is there any way to make a working export?

(it goes without saying that the "original" repository can be opened just fine, and has no merges going on)

--- answering question ---
"Are you running git log inside of the .git folder?"
I ran it both outside and inside, and also ran it on another "working" repository, just to make sure it was indeed an issue with the "broken" one and not with the command itself

"show us the text output of ls -lAF of the .git folder"

Microsoft Windows [Version 10.0.22631.5039]
(c) Microsoft Corporation. All rights reserved.

C:\Work\PLCExport2>dir /a /q
 Volume in drive C is Windows
 Volume Serial Number is 2848-2CFA

 Directory of C:\Work\PLCExport2

02/04/2025  12:24    <DIR>          RAMELDOM\ABardelli     .
02/04/2025  12:29    <DIR>          RAMELDOM\ABardelli     ..
27/03/2025  18:15    <DIR>          RAMELDOM\ABardelli     .git
30/01/2025  17:04             7.836 RAMELDOM\ABardelli     .gitignore
02/04/2025  12:24    <DIR>          RAMELDOM\ABardelli     Intact_1360
07/02/2025  12:54             4.485 RAMELDOM\ABardelli     INTACT_1360.sln
07/02/2025  12:54           134.656 RAMELDOM\ABardelli     INTACT_1360.v12.suo
               3 File(s)        146.977 bytes
               4 Dir(s)  1.548.583.587.840 bytes free

---- closed ----
I was unable to reproduce the issue.
Before asking the question i copied more than once, to different PCs, and also tried to access it as a shared folder.
Now all the above work.

I'd certainly like to understand what was preventing the previous copy to work, but i guess we can dismiss it as non-git-related problems.

Thank you for your time

发布评论

评论列表(0)

  1. 暂无评论