Skip to content

[stable25] Fix small issues around delete/undo - #5440

Merged
juliusknorr merged 4 commits into
stable25from
backport/5296/stable25
Jan 9, 2024
Merged

juliusknorr merged 4 commits into
stable25from
backport/5296/stable25

Conversation

@juliusknorr

Copy link
Copy Markdown
Member

Backport of #5296

Signed-off-by: Julius H盲rtl <jus@bitgrid.net>
@cypress

cypress Bot commented Jan 9, 2024

Copy link
Copy Markdown

Passing run #1728 鈫楋笌

0 6 0 0 Flakiness 0

Details:

Merge 23901ff into 9b78550...
Project: Deck Commit: f74cd2a222 鈩癸笍
Status: Passed Duration: 01:59 馃挕
Started: Jan 9, 2024 5:22 PM Ended: Jan 9, 2024 5:24 PM

Review all test suite changes for PR #5440 鈫楋笌

Signed-off-by: Julius H盲rtl <jus@bitgrid.net>
Signed-off-by: Julius H盲rtl <jus@bitgrid.net>
Signed-off-by: Julius H盲rtl <jus@bitgrid.net>
@juliusknorr
juliusknorr merged commit 041f3e6 into stable25 Jan 9, 2024
@juliusknorr
juliusknorr deleted the backport/5296/stable25 branch January 9, 2024 18:36
@juliusknorr

Copy link
Copy Markdown
Member Author

/backport to stable24

@juliusknorr

Copy link
Copy Markdown
Member Author

/backport to stable23

@backportbot-nextcloud

Copy link
Copy Markdown

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

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

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

# 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-stable23

Error: Unknown error

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

@backportbot-nextcloud

Copy link
Copy Markdown

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

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

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

# 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-stable24

Error: Unknown error

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

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.

1 participant