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(v1.5.1): fix:preventthesamerecordwiththesamedraft-idfrombeingsubmittedtwice[OCRVS-7477] #7550

Merged
merged 2 commits into from
Aug 29, 2024

Conversation

ocrvs-bot
Copy link
Collaborator

Automated PR to merge changes from develop to release-v1.5.1

I failed to cherry-pick the changes automatically because of the following:

Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
Auto-merging packages/commons/src/fhir/task.ts
Auto-merging packages/commons/src/fhir/transformers/fhir-builders.test.ts
Auto-merging packages/workflow/src/records/fhir.ts
CONFLICT (content): Merge conflict in packages/workflow/src/records/fhir.ts
error: could not apply 18f7538ec... fix: prevent the same record with the same draft-id from being submitted twice

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.5.1-7544-6442:auto-pr-release-v1.5.1-7544-6442
git fetch origin ocrvs-7477:ocrvs-7477

git checkout auto-pr-release-v1.5.1-7544-6442
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 18f7538ec 788a4e296

@rikukissa rikukissa force-pushed the auto-pr-release-v1.5.1-7544-6442 branch from 27d6e4f to 6a044dd Compare August 29, 2024 11:30
@rikukissa rikukissa force-pushed the auto-pr-release-v1.5.1-7544-6442 branch from 6a044dd to 2994d6c Compare August 29, 2024 11:30
@rikukissa rikukissa enabled auto-merge (squash) August 29, 2024 11:31
@rikukissa rikukissa merged commit d1980ed into release-v1.5.1 Aug 29, 2024
21 checks passed
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