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 #196 to #197

Closed
wants to merge 1 commit into from

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Jul 5, 2024

Automated PR to merge changes from develop to

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

Auto-merging infrastructure/docker-compose.deploy.yml
Auto-merging infrastructure/docker-compose.development-deploy.yml
Auto-merging infrastructure/docker-compose.production-deploy.yml
Auto-merging infrastructure/docker-compose.qa-deploy.yml
Auto-merging infrastructure/docker-compose.staging-deploy.yml
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

  git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
On branch auto-pr--196-30291
You are currently cherry-picking commit 574d43a7.
(all conflicts fixed: run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

To continue manually you can use these commands:

git fetch origin auto-pr--196-30291:auto-pr--196-30291
git fetch origin remove_deprecated_versions_from_compose:remove_deprecated_versions_from_compose

git checkout auto-pr--196-30291
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 574d43a7ba6c0cf70bf4aa0468af3c6a44180b14

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