Parts Git Status has 4 States, the first 3 should be easy to interpret.
1) Blank (Repo is Clean, Nothing to Report)
2) Save to Server
3) Update from Server
4) Resolve Conflict !
If you see Resolve Conflict ! in the Parts main menu:
Click the image below to view a larger example.
Things to Try at Your Own Risk
Important: git reset --hard origin/master
will discard uncommitted local changes. Commit or stash work before proceeding.
First preserve any local changes in your working folder.
Open PowerShell, change to the repository folder and execute:
git statusUsi
git commit -m "WIP before recovery"
or
git stash
git pull
git reset --hard origin/master
git pull
git fsck --full
Expected Result:
- Local repository synchronized with the server
- Working folder cleaned up
- Repository integrity verified
- Ready to continue working
Advanced Diagnostic Tests
Determine whether the repository is a shallow clone:
git rev-parse --is-shallow-repository
If the command returns:
true
Attempt to convert the repository to a full clone:
git fetch --unshallow
Wait for the fetch to complete:
Enumerating objects...
Counting objects...
Compressing objects...
Receiving objects...
Resolving deltas...
When finished, verify the repository again:
git rev-parse --is-shallow-repository
then
git fsck --full
If errors occur during the unshallow operation, save the complete error message for technical support.