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

[4.2.x] Fix celery containet in docker-compose.yml #515

Merged
merged 1 commit into from
Jan 23, 2024
Merged

Conversation

afabiani
Copy link
Member

No description provided.

@afabiani afabiani self-assigned this Jan 23, 2024
@giohappy giohappy merged commit 1ae445c into 4.2.x Jan 23, 2024
2 checks passed
@giohappy giohappy deleted the afabiani-patch-1 branch January 23, 2024 11:47
Copy link

The backport to 4.1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.1.x 4.1.x
# Navigate to the new working tree
cd .worktrees/backport-4.1.x
# Create a new branch
git switch --create backport-515-to-4.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1ae445ce3635dd29171097900c4949726040faa0
# Push it to GitHub
git push --set-upstream origin backport-515-to-4.1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.1.x

Then, create a pull request where the base branch is 4.1.x and the compare/head branch is backport-515-to-4.1.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants