This ticket merges master into sync, meaning that sync can now be cleanly merged into master whenever we're ready to do so
This brings the following to the sync branch
working linter
working documentation generation
changes from STITCH-2008, STITCH-2240, and various other tickets
depdendency graph fixes
There are several outstanding issues, and I've filed tickets for each of them:
a race condition in testConflictForEmptyVersionDocuments
unresolved linter warnings in StitchCoreSDK
unresolved linter warnings in StitchCoreRemoteMongoDBService
broken StitchLocalMongoDBService
the jazzy config needs to be updated so that documentation for Mobile Sync is presented cleanly to the end user
The changes in this PR in .gitattributes are to treat .pbxproj files as binary files, meaning they will no longer produce line-by-line merge conflicts, but they will always prefer the local copy of a pbxproj file. This makes dealing with merge conflicts easier, but it means in the future we will sometimes have to relink files to the project, and re-update build settings that were updated before a merge.
This ticket merges master into sync, meaning that sync can now be cleanly merged into master whenever we're ready to do so
This brings the following to the
syncbranchThere are several outstanding issues, and I've filed tickets for each of them:
testConflictForEmptyVersionDocumentsStitchCoreSDKStitchCoreRemoteMongoDBServiceStitchLocalMongoDBServiceThe changes in this PR in
.gitattributesare to treat.pbxprojfiles as binary files, meaning they will no longer produce line-by-line merge conflicts, but they will always prefer the local copy of a pbxproj file. This makes dealing with merge conflicts easier, but it means in the future we will sometimes have to relink files to the project, and re-update build settings that were updated before a merge.