chore: merge production into staging (resolve v1.1 release conflicts)#710
Merged
Conversation
<!-- - Title the PR with the JIRA project & ticket number and short description (e.g., BDMS-123: Example display bug), or NO TICKET - Keep sections short and scannable. --> ### **Why** _This PR addresses the following problem / context:_ - Use bullet points here ### **How** _Implementation summary - the following was changed / added / removed:_ - Use bullet points here ### **Notes** _Any special considerations, workarounds, or follow-up work to note?_ - Use bullet points here --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Jeremy Zilar <jeremyzilar@gmail.com> Co-authored-by: jeremyzilar <395641+jeremyzilar@users.noreply.github.com> Co-authored-by: Jeremy Zilar <jeremy.zilar@lakeraven.com> Co-authored-by: Kelsey Smuczynski <ksmuczynski@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tyler Adam Martinez <TylerAdamMartinez@outlook.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Likitha Bommasani <likitha.bommasani@nmt.edu> Co-authored-by: Jacob Brown <29125483+jacob-a-brown@users.noreply.github.com> Co-authored-by: jirhiker <2035568+jirhiker@users.noreply.github.com>
# Conflicts: # .github/workflows/CD_production.yml # .github/workflows/release-please.yml
This file contains hidden or 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
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.
Why
#709 (build: v1.1, staging → production) is CONFLICTING — production has commits not in staging, and both branches edited the CD/release workflows.
How
origin/productionintostaging..github/workflows/CD_production.ymlandrelease-please.ymlresolved by keeping the staging versions — they are the newer reusable-workflow +--no-devdeploy changes that supersede production's older release-only copies.Notes
productionwon't become an ancestor ofstaging, so build: v1.1 #709 would stay conflicting (same issue as the earlier chore: merge production into staging #696/chore: merge production into staging (preserve merge commit) #697 round).