-
Notifications
You must be signed in to change notification settings - Fork 0
Working with Upstream
Vlad Sitalo edited this page Jan 18, 2024
·
1 revision
Brief notes
- Initiate the merge
- Resolve conflicts
- If there were new migrations in upstream - create a new no-op migration to get a coherent accepted_schema.sql file
- You'd also need to manually run out of order migrations on all your databases (automated migration WF in Github Actions won't work)
- If there were changes to editor config/code in upstream - rebuild editor to combine our changes
- Run
yarn generateto update types - Don't forget to git add newly generated files (schema, types, editor build, etc)
- Add settings to a setting repo when necessary
- Build and resolve type-checkign issues/merge things you've missed
- Verify there are no undesirable user-visible changes brought by the merge