Xcode 12.5.1 (or git) keeps deleting Package.resolved from our repo

1.6k Views Asked by At

I'm on a team of three developers working on an Xcode project that uses SPM dependencies (only; no Cocoapods, etc). Our repo is hosted at Github.

Proj.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved was initially committed to the repo. Switching to Xcode 13b periodically would cause massive changes to that file, so for a time, we had a .gitignore file in Proj.xcodeproj/project.xcworkspace/xcshareddata/ that ignored Package.resolved. Recently I removed that, and re-added Package.resolved to the repo.

Now we’re seeing this behavior where periodically, Package.resolved will be deleted upon git pull, and git will report

$ git status
On branch add-google-sign-in-package
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
    modified:   Whatnot.xcodeproj/project.pbxproj

Untracked files:
  (use "git add <file>..." to include in what will be committed)
    whatnot.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/

We can’t find a commit that shows the file being deleted. I’ve never seen it as a staged-for-deletion in git status. At no point does the old .gitignore file re-appear.

Update: This might be related to creating and merging branches.

Any idea what’s causing this?

0

There are 0 best solutions below