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

🍒 Merge changes from PR #7813 to release-v1.6.2 #8261

Closed
wants to merge 1 commit into from

Conversation

ocrvs-bot
Copy link
Collaborator

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

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

Auto-merging packages/config/src/handlers/application/applicationConfigHandler.ts
CONFLICT (content): Merge conflict in packages/config/src/handlers/application/applicationConfigHandler.ts
error: could not apply 0084224cb... update config package to get certificates config from country config

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.2-7813-23878:auto-pr-release-v1.6.2-7813-23878
git fetch origin ocrvs-7584:ocrvs-7584

git checkout auto-pr-release-v1.6.2-7813-23878
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 0084224cb 306e56eb5 6f2ecdf9d be4d5c6aa bcacdc005 6ba8f28fa 08137c78f 46773ad51 02124852b f8d2c5e4c c09eda937 98eb59721 c68e2872e 2f87522d2 6b1f8553d a1c7b2561 b1e2928c4 974777dcd a7f80c7f6 1a3bb1b50 48dba914e cf3e78420 c117a06b9 28a728f49 9a2b61e37 6bd15a5bd f46704318 ab6e0795d 437fbb091 f50615c95 0960666ca 64460a5b2 28615c8e5 5eaeb3c0f 7678d2979 109c758a6 7e00c9c89 b03d7d6a3 93ae09325 6da6fb8e4 6a7050709 983816989 ce03d153d 4159cc257 92710491d 697b59a17 580a0de8c 400c6e7ba 616944d78 f3f0feacf 8d1b76b0b 8d103031c 5e36fa02a dfab7ed53 4a121d183 5b5f9a186 275f9113f 7f86255a1

Copy link

Oops! Looks like you forgot to update the changelog. When updating CHANGELOG.md, please consider the following:

  • Changelog is read by country implementors who might not always be familiar with all technical details of OpenCRVS. Keep language high-level, user friendly and avoid technical references to internals.
  • Answer "What's new?", "Why was the change made?" and "Why should I care?" for each change.
  • If it's a breaking change, include a migration guide answering "What do I need to do to upgrade?".

@Zangetsu101 Zangetsu101 deleted the auto-pr-release-v1.6.2-7813-23878 branch December 26, 2024 11:57
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.

3 participants