Skip to content
This repository was archived by the owner on Jul 14, 2026. It is now read-only.

chore: update changelog - #13910

Closed
owncloud-calens-bot[bot] wants to merge 1 commit into
masterfrom
chore/changelog-update
Closed

owncloud-calens-bot[bot] wants to merge 1 commit into
masterfrom
chore/changelog-update

Conversation

@owncloud-calens-bot

Copy link
Copy Markdown
Contributor

Automated changelog update via Calens. This pull request is updated on each push to master — merging it will close it and a fresh one will be opened on the next change.

@update-docs

update-docs Bot commented Jun 26, 2026

Copy link
Copy Markdown

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@kw-security

kw-security commented Jun 26, 2026 •

Copy link
Copy Markdown
Contributor

✅ Snyk checks have passed. No issues have been found so far.

Status Scan Engine Critical High Medium Low Total (0)
✅ Open Source Security 0 0 0 0 0 issues
✅ Licenses 0 0 0 0 0 issues
✅ Code Security 0 0 0 0 0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

@DeepDiver1975 DeepDiver1975 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automated maintainer review (Claude Code review agent).

Duplicate detection: This PR (#13910) and #13911 share the same head commit e334b3b on the same branch chore/changelog-update, but target different base branches:

  • #13910 (this PR) → base master — shows 84 changed files and is CONFLICTING / DIRTY. The branch content belongs to the stable-12.4 line, so diffing it against the diverged master produces a large spurious diff and a merge conflict. This is not a clean changelog update against master.
  • #13911 → base stable-12.4 — shows exactly 1 file (CHANGELOG.md), a clean calens changelog regen, and is MERGEABLE.

Conclusion: #13911 is the canonical changelog PR; #13910 appears to be a mis-based duplicate (correct branch, wrong base). I recommend closing #13910 (or re-basing it onto the intended branch if a master changelog update was actually wanted) and proceeding with #13911.

I am not approving or merging this PR: it is the non-canonical duplicate and is currently un-mergeable (conflicts against master). To avoid a duplicate-merge race, the changelog merge should go through #13911 only.

changelog: this PR is the changelog update (n/a — nothing to add).

@owncloud-calens-bot
owncloud-calens-bot Bot force-pushed the chore/changelog-update branch 2 times, most recently from bea84e9 to 83086ad Compare June 26, 2026 09:56
@sonarqubecloud

Copy link
Copy Markdown

@owncloud-calens-bot
owncloud-calens-bot Bot force-pushed the chore/changelog-update branch 2 times, most recently from f373698 to 4a25abb Compare June 26, 2026 09:59

@DeepDiver1975 DeepDiver1975 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 Automated review by the Claude Code review agent (acting as maintainer).

Verdict: comment — recommend closing this PR as a non-canonical duplicate.

This calens changelog-regen PR (chore/changelog-update, head 4a25abb) shares the exact same head commit as #13911. The two differ only in base branch:

  • This PR (#13910) targets master. Because the chore/changelog-update branch is based on the release line, the diff against master balloons to 80+ unrelated files (workflows, package.json, translations, components, …) and GitHub reports it CONFLICTING / DIRTY. This is the mis-based copy.
  • #13911 targets stable-12.4, where the same head reduces to a clean single-file CHANGELOG.md update and is MERGEABLE. That is the canonical PR.

Recommendation: close #13910 and proceed with #13911. No changes needed to the changelog content itself — this is the changelog update (changelog=present), and the canonical PR carries it correctly.

@owncloud-calens-bot
owncloud-calens-bot Bot force-pushed the chore/changelog-update branch from 4a25abb to cd0e3fd Compare June 26, 2026 11:15

@DeepDiver1975 DeepDiver1975 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automated maintainer review (Claude Code agent).

This is a calens changelog regeneration on chore/changelog-update (head cd0e3fd) — the changelog update itself, so the changelog requirement is satisfied (this PR is the changelog).

However, #13910 and #13911 share the same head commit (cd0e3fd) and are duplicates. #13910 is based on master and currently reports mergeable: CONFLICTING / DIRTY — its diff is mis-based against master and pulls in unrelated changes (whole workflow files, etc.), so it cannot merge cleanly. #13911 is based on the correct release branch stable-12.4 and is MERGEABLE.

Recommendation: close this PR (#13910) as the non-canonical, mis-based duplicate and proceed with #13911 as the canonical changelog update. No code review concerns beyond the duplication/base mismatch.

@owncloud-calens-bot
owncloud-calens-bot Bot force-pushed the chore/changelog-update branch 3 times, most recently from e84ec16 to 0409920 Compare June 29, 2026 15:29
@DeepDiver1975

Copy link
Copy Markdown
Contributor

Canonical changelog regen — base master, single commit touching only CHANGELOG.md (1 file), mergeable: MERGEABLE (BLOCKED only on required review/CLA, no conflicts). This is the correct one of the duplicate pair. Review-only repo, so not merging from here.

🤖 Generated with Claude Code

@owncloud-calens-bot
owncloud-calens-bot Bot force-pushed the chore/changelog-update branch 3 times, most recently from 38d323b to 60c9bf3 Compare June 30, 2026 19:06

@DeepDiver1975 DeepDiver1975 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated review — state changed materially since my earlier comment (which called this PR canonical). It is no longer.

Verdict: close this one; keep #13911.

The shared branch chore/changelog-update (tip 60c9bf31) now sits on the stable-12.4 line, not master:

  • vs master: diverged, ahead 24 / behind 86 → 90 files, CONFLICTING/DIRTY. The diff is the entire stable-12.4↔master divergence (release commits, backports, translations), not a changelog regen.
  • vs stable-12.4 (#13911): ahead 1 / behind 0, single file CHANGELOG.md, MERGEABLE.

So this is a changelog regen for the release branch mis-targeted at master. It can't merge here as-is and shouldn't (it'd drag 24 release-line commits into master). Close in favor of #13911. A changelog regen for master needs a separate branch cut from master.

🤖 Generated with Claude Code

@owncloud-calens-bot
owncloud-calens-bot Bot force-pushed the chore/changelog-update branch from 60c9bf3 to d228462 Compare July 1, 2026 07:31
@owncloud-calens-bot
owncloud-calens-bot Bot force-pushed the chore/changelog-update branch from d228462 to c49195e Compare July 1, 2026 12:57
@sonarqubecloud

sonarqubecloud Bot commented Jul 1, 2026

Copy link
Copy Markdown

@LukasHirt

Copy link
Copy Markdown
Collaborator

Web repo is going to be archived and will no longer accept new PRs. Please, use owncloud/ocis repository instead.

@LukasHirt LukasHirt closed this Jul 1, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants