[No QA] Update staging,prod from a separate branch to auto-resolve conflicts #3521
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jag96
approved these changes
Jun 10, 2021
|
🚀 Deployed to staging in version: 1.0.66-13🚀
|
49 tasks
roryabraham
changed the title
|
🚀 Deployed to production in version: 1.0.68-4🚀
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Details
Details in slack here, but
TL;DR CPs broke regular staging deploys like so:
mainto1.0.66-10. Commit the change (commit hash XYX).git checkout staging && git cherry-pick XYX. This makes the version onstagingmatchmain.mainand bump the version to1.0.66-11. Commit the change.git checkout staging && git merge main-> ❌ Merge conflict inpackage.json, etc...Fixed Issues
(hopefully) Fixes big ol' deploy fire 🔥
Tests
Merge this and see if a staging deploy happens. 🤞
QA Steps
None.
Tested On
Github only.