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 #7479 to release-v1.6.0 #7568

Merged
merged 1 commit into from
Sep 4, 2024

Conversation

ocrvs-bot
Copy link
Collaborator

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

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/client/Dockerfile
Auto-merging packages/client/vite.config.ts
error: could not apply e56b9b709... Get client manifest and icons from country-config

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-7479-12670:auto-pr-release-v1.6.0-7479-12670
git fetch origin ocrvs-7466:ocrvs-7466

git checkout auto-pr-release-v1.6.0-7479-12670
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick e56b9b709

@tareq89 tareq89 force-pushed the auto-pr-release-v1.6.0-7479-12670 branch from f22ad5d to 84acf70 Compare September 4, 2024 09:39
@tareq89 tareq89 enabled auto-merge (rebase) September 4, 2024 09:39
@tareq89 tareq89 force-pushed the auto-pr-release-v1.6.0-7479-12670 branch from 84acf70 to 4eb413c Compare September 4, 2024 09:56
@tareq89 tareq89 merged commit ce187c2 into release-v1.6.0 Sep 4, 2024
22 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