Production deploy: promote staging → main#180
Merged
Conversation
Co-authored-by: badarouzia <ziane.badarou@epitech.eu>
Co-authored-by: badarouzia <ziane.badarou@epitech.eu> Co-authored-by: Bhupow <114442972+BhuvanArn@users.noreply.github.com>
Co-authored-by: Andriamanampisoa <toavina.andriamanampisoa@epitech.eu> Co-authored-by: Andriamanampisoa <114677493+Andriamanampisoa@users.noreply.github.com>
Co-authored-by: badarouzia <ziane.badarou@epitech.eu> Co-authored-by: BhuvanArn <bhuvanarnaud@gmail.com>
Co-authored-by: BhuvanArn <bhuvanarnaud@gmail.com> Co-authored-by: Bhupow <114442972+BhuvanArn@users.noreply.github.com>
Co-authored-by: badarouzia <ziane.badarou@epitech.eu> Co-authored-by: BhuvanArn <bhuvanarnaud@gmail.com>
Co-authored-by: Bhupow <114442972+BhuvanArn@users.noreply.github.com>
Co-authored-by: BhuvanArn <bhuvanarnaud@gmail.com> Co-authored-by: Bhupow <114442972+BhuvanArn@users.noreply.github.com>
…n simulation (#135) Co-authored-by: Andriamanampisoa <toavina.andriamanampisoa@epitech.eu>
Co-authored-by: Andriamanampisoa <114677493+Andriamanampisoa@users.noreply.github.com> Co-authored-by: badarouzia <114598760+badarouzia@users.noreply.github.com> Co-authored-by: badarouzia <ziane.badarou@epitech.eu> Co-authored-by: Andriamanampisoa <toavina.andriamanampisoa@epitech.eu> Co-authored-by: eregine <114678670+eregine@users.noreply.github.com>
Co-authored-by: BhuvanArn <bhuvanarnaud@gmail.com>
Co-authored-by: BhuvanArn <bhuvanarnaud@gmail.com> Co-authored-by: Bhupow <114442972+BhuvanArn@users.noreply.github.com>
Co-authored-by: BhuvanArn <bhuvanarnaud@gmail.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: BhuvanArn <bhuvanarnaud@gmail.com> Co-authored-by: Bhupow <114442972+BhuvanArn@users.noreply.github.com>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
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.
Production promote: staging → main
Promotes all merged staging work to production
main.What this is
Merge commit whose tree is byte-identical to
origin/staging(verified:git rev-parse HEAD^{tree}==origin/staging^{tree}). Parents are currentmain+staging, somainnow contains staging's history and future promotes stop re-conflicting on the same files.Conflict resolution
stagingandmaindiverged by 88 files — past promotes hand-resolved conflicts onmainthat never flowed back, so the same files re-conflict every promote. Resolved by makingmain's tree exactlystaging's (staging is source-of-truth for a promote).web/src/routes/applications/$applicationId/dashboard.tsx— dead since [140] Add new sidebar front #107; staging replaced the wholeapplications/$applicationId/tree (roadmap/analytics/simulations).ai/llm-corepresent on both branches (17 files each) — no loss.-X theirsresolution that duplicated a function + imports (would have broken the build).Before merging
🤖 Generated with Claude Code