Skip to content
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 29 commits into from
Nov 19, 2024
Merged

fix(support): fixing merge overwrite #475

merged 29 commits into from
Nov 19, 2024

Conversation

paulushcgcj
Copy link
Contributor

@paulushcgcj paulushcgcj commented Nov 19, 2024

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.

  • Bug fix (non-breaking change which fixes an issue)

Checklist

  • I have read the CONTRIBUTING doc
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have already been accepted and merged

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

DerekRoberts
DerekRoberts previously approved these changes Nov 19, 2024
Copy link
Member

@DerekRoberts DerekRoberts left a 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. :)

Copy link
Member

@DerekRoberts DerekRoberts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good recovery. :)

@paulushcgcj paulushcgcj enabled auto-merge (squash) November 19, 2024 22:58
@paulushcgcj paulushcgcj merged commit 337c414 into main Nov 19, 2024
19 checks passed
@paulushcgcj paulushcgcj deleted the support/resore branch November 19, 2024 23:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants