I've been having problems with git on Windows for a few days now:
git version 2.36.2.windows.1
In conjunction with Microsoft Azure DevOps Server 2019.
When I pull or merge, it occasionally keeps the obsolete/older file.
It looks like git is not only checking the hash, but also somehow the timestamp and it got messed up.
I now have a clean working tree, but the remote file differs from my local copy of the same commit hash.
How does it happen?
Example:
git fetch origin
git checkout test
git ...READ MORE
Dec 20, 2022
in DevOps on Cloud
by
Damonlang
• 1,230 points
•
307 views
