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

fix: chunk delete in query #1359

Merged
merged 1 commit into from Oct 12, 2023
Merged

fix: chunk delete in query #1359

merged 1 commit into from Oct 12, 2023

Conversation

miaulalala
Copy link
Collaborator

No description provided.

@miaulalala
Copy link
Collaborator Author

/backport to stable27

Signed-off-by: Anna Larch <anna@nextcloud.com>
@susnux susnux merged commit fe2d728 into master Oct 12, 2023
30 checks passed
@susnux susnux deleted the fix/chunk-delete-in-query branch October 12, 2023 14:30
@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@miaulalala
Copy link
Collaborator Author

Cherry-picks fail too:

git cherry-pick 9bee2e2
fatal: bad revision '9bee2e2'

git cherry-pick 9bee2e2bf373b407ea2e5887f7aac4a5e8a58862
fatal: bad object 9bee2e2bf373b407ea2e5887f7aac4a5e8a58862

Any tips @nickvergessen @ChristophWurst ?

@nickvergessen
Copy link
Member

git fetch origin master

?

@ChristophWurst
Copy link
Member

/backport to stable27

@miaulalala
Copy link
Collaborator Author

/backport to stable27

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

Successfully merging this pull request may close these issues.

None yet

6 participants