"Cannot move file" after asset package re-import

So we've run into the issue again, but are having more/different issues than in the past. It's still due to asset reimport on one machine, then trying to pull down latest from another.

One issue is that even if you add a dummy .meta file, Unity will remove it if the associated asset doesn't exist. Making a new asset in its place doesn't do anything to alleviate that situation, either. Seems to be a GUID/UUID issue? Is there a way to run a collaborate Pull command from command line so Unity won't nuke the new .meta file and allow for a clean pull?

Once again, this happens every time we re-import an asset package, which is sometimes unavoidable. If there is a workflow I don't know about, that would remove this issue?

Flow causing the issue:
Comp 1 updates a package from the Unity Store or external package in general
Comp 1 pushes
Comp 2 tries to pull
Comp 2 gets "Cannot move file" error
Comp 2 checks logs to look for the conflict, but it does not always show which files are causing the issue