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 #8010 to release-v1.6.2 #8170

Merged
merged 7 commits into from
Dec 9, 2024

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 yarn.lock
CONFLICT (content): Merge conflict in yarn.lock
error: could not apply 8dec4bc89... Save SVG cert to Minio correctly

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.2-8010-80:auto-pr-release-v1.6.2-8010-80
git fetch origin ocrvs-7589-ocrvs-7886:ocrvs-7589-ocrvs-7886

git checkout auto-pr-release-v1.6.2-8010-80
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 8dec4bc89 51c51ea05 a10ba8a8b 6c2f5f697 790ff53a6 69cd98a02 1e3724293

Copy link

github-actions bot commented Dec 9, 2024

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?".

@euanmillar euanmillar force-pushed the auto-pr-release-v1.6.2-8010-80 branch from 33f6823 to e0e03e5 Compare December 9, 2024 11:31
@euanmillar euanmillar force-pushed the auto-pr-release-v1.6.2-8010-80 branch from e0e03e5 to 0fda0af Compare December 9, 2024 11:49
@euanmillar euanmillar merged commit 8c8b46b into release-v1.6.2 Dec 9, 2024
60 checks passed
@euanmillar euanmillar deleted the auto-pr-release-v1.6.2-8010-80 branch December 9, 2024 12:03
@euanmillar euanmillar restored the auto-pr-release-v1.6.2-8010-80 branch December 9, 2024 12:04
@euanmillar euanmillar deleted the auto-pr-release-v1.6.2-8010-80 branch December 9, 2024 12:30
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