land fix/changelog-merge-union (b85415f3b5) #13

Merged

gitea_admin merged 1 commit from fix/changelog-merge-union into trunk 2026-07-05 12:16:56 +00:00

Conversation 0 Commits 1 Files changed 1 +7

gitea_admin commented 2026-07-05 12:16:55 +00:00

Contributor

Copy link

No description provided.

gitea_admin added 1 commit 2026-07-05 12:16:55 +00:00

fix(cicd): auto-resolve CHANGELOG land conflicts via .gitattributes merge=union b85415f3b5

gitea_admin merged commit 03fad69239 into trunk 2026-07-05 12:16:56 +00:00

gitea_admin deleted branch fix/changelog-merge-union 2026-07-05 12:16:56 +00:00

gitea_admin referenced this pull request from a commit 2026-07-05 12:16:57 +00:00

Merge pull request 'land fix/changelog-merge-union (b85415f3b57d)' (#13) from fix/changelog-merge-union into trunk

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

sean/rpg-hello!13

No description provided.