Closed josemvidal closed 3 years ago
The CovidGains/.DS_Store files are generated by macs and should not be in your git repo. git rm them.
git rm
Also, add a .gitignore file to prevent this from happening again. You can use gitignore.io - Create Useful .gitignore Files For Your Project
.gitignore
If you don't do this, your xcode might crash, or worse, because you are using personal data (in xcuserdata) from your teammate.
xcuserdata
Also, no more merge conflicts!
The .gitignore file has been updated
The CovidGains/.DS_Store files are generated by macs and should not be in your git repo.
git rm
them.Also, add a
.gitignore
file to prevent this from happening again. You can use gitignore.io - Create Useful .gitignore Files For Your Project