Resolving merge conflicts, pulling commits from main into stage (rebasing stage from main) #40
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
…o Prod (main) (adobecom#37) * MWPW-150372: Refactor (adobecom#23) * MWPW-150372: Refactor * MWPW-150372: Removing temp logs * MWPW-150372: Unit tests failure after refactor * MWPW-154226: Remove host and referrer (adobecom#27) * .env template update * Batch Updates from feature branch to Stage branch (adobecom#32) * Promote API Batching Implementation (adobecom#29) * Promote API Batching Implementation * Refactor Promote Batching * Performing sequential Promote of Batches, instead of parallel promote actions & Removed spToken and validateAction * Batching Updates (adobecom#31) Batching updates - Deleting all image paths which exist only in .md and show up while processing - Don't execute async copy or promote operations, perform sequentially - Handle Promote and Copy batches in parallel - Adding in-progress statuses for not repeating the already initiated steps in schedulers and actions - Awaiting all copy and promote steps before updating the status to avoid impact of promote and copy in parallel - Cross referencing & checking existence of same bathes in Copy from promote worker and vice versa before updating batch statuses as promoted * Removing DriveID from github secrets and .env, so it gets passed as input from API Payload from UI (adobecom#33) * MWPW-162341 - Reattempting Preview for Failed Previews (adobecom#34) MWPW-162341 - Reattempting Preview for Failed Previews * Added Excel Update & logging (adobecom#35) * Merging 'main' to 'stage' for syncing the commits & resolving merge conflicts (adobecom#36) Releasing Stage to Main (adobecom#28) * MWPW-150372: Refactor (adobecom#23) * MWPW-150372: Refactor * MWPW-150372: Removing temp logs * MWPW-150372: Unit tests failure after refactor * MWPW-154226: Remove host and referrer (adobecom#27) * .env template update Co-authored-by: Sunil Kamat <107644736+sukamat@users.noreply.github.com> --------- Co-authored-by: Sunil Kamat <107644736+sukamat@users.noreply.github.com> Co-authored-by: sukamat <sukamat@adobe.com>
JackySun9
approved these changes
Dec 17, 2024
sukamat
approved these changes
Dec 17, 2024
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.
No description provided.