Sync Fork (Feb. 2 Week)

[NEStock]

Steps

• Create new branch sync-... from prod
• Sync master with (from) dandi/dandi-archive:master
  • Using GitHub buttton on this repository's home page
• Review dandi/dandi-archive Release history - https://github.com/dandi/dandi-archive/releases to determine the latest release commit id
• IF: The latest release commit id == the top of master, proceed with
  • Open a pull request to merge master into sync-...
    • master contains all of the dandi-archive update
    • while sync-... contains all of our EMBER updates
  • Review changes
  • Resolve merge conflicts
    • I usually do this locally by merging master into sync-... and dealing with conflicts in VSCode. Because, we don't want to add any of our EMBER changes to the master branch. We want master to always be "dandi-only" code
  • PR closed
• ELSE: master is ahead of the latest release
  • (Locally) Merge commits from master up to the latest release commit id
    • you can do this with git checkout sync-... & git merge <commit-id>
    • master @ contains all of the dandi-archive updates up to their latest production release
    • while sync-... contains all of our EMBER updates

Now, sync-... contains all of the updates both from dandi-archive and our fork!

• Open pull request to merge sync-... into apl-setup to update our sandbox deployment
• Review changes
• Coordinate with Dandi-Infratrcuture changes!
• Merge PR

Lastly, don't forgot to update prod !

• Open a pull request to merge apl-setup into prod
• Review changes (this may include additional EMBER changes that we haven't yet deployed to prod)
• Merge PR