generated from bcgov/quickstart-openshift
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(support): fixing merge overwrite #475
Merged
Merged
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
) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit c065264)
paulushcgcj
requested review from
carolinemwood,
jazzgrewal,
DerekRoberts and
gpascucci
as code owners
November 19, 2024 14:19
Co-authored-by: Derek Roberts <derek.roberts@gmail.com> (cherry picked from commit 07a93fc)
# Conflicts: # frontend/package-lock.json
DerekRoberts
previously approved these changes
Nov 19, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Glad this was saved. :)
This was referenced Nov 19, 2024
DerekRoberts
approved these changes
Nov 19, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good recovery. :)
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.
Description
Fixing code that was overwritten during the merge conflict resolution of the PR #463
Type of change
Please delete options that are not relevant.
Checklist
Further comments
Thanks for the PR!
Any successful deployments (not always required) will be available below.
Backend: https://nr-silva-475-backend.apps.silver.devops.gov.bc.ca/actuator/health
Frontend: https://nr-silva-25-frontend.apps.silver.devops.gov.bc.ca
Once merged, code will be promoted and handed off to following workflow run.
Main Merge Workflow