Skip to content

[stable35] fix(dav): pair changed iTip instances by UID/RECURRENCE-ID instead of… - #66015

Merged
susnux merged 1 commit into
stable35from
backport/64635/stable35
Nov 5, 2026
Merged

susnux merged 1 commit into
stable35from
backport/64635/stable35

Conversation

@backportbot

@backportbot backportbot Bot commented Oct 29, 2026 •

Copy link
Copy Markdown

Backport of #64635

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Review and verify the backported changes
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot Bot added the 3. to review Waiting for reviews label Oct 29, 2026
@backportbot backportbot Bot added this to the Nextcloud 35.0.3 milestone Oct 29, 2026
… array position

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
@SebastianKrupinski
SebastianKrupinski marked this pull request as ready for review October 29, 2026 16:19
@SebastianKrupinski
SebastianKrupinski requested review from Altahrim, come-nc, leftybournes and salmart-dev and removed request for a team October 29, 2026 16:19
@SebastianKrupinski

Copy link
Copy Markdown
Contributor

/backport to stable34

@susnux
susnux merged commit d547c0d into stable35 Nov 5, 2026
185 of 201 checks passed
@susnux
susnux deleted the backport/64635/stable35 branch November 5, 2026 10:48
@backportbot

backportbot Bot commented Nov 5, 2026

Copy link
Copy Markdown
Author

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

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

# Create the new backport branch
git checkout -b backport/66015/stable34

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick a8b846ad

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/66015/stable34

Error: Failed to check for changes with origin/stable34: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants