Skip to content

chore: rebase fork onto upstream/main (7 commits)#107

Merged
Deeds67 merged 0 commit intomainfrom
worktree-upstream-rebase
Mar 17, 2026
Merged

chore: rebase fork onto upstream/main (7 commits)#107
Deeds67 merged 0 commit intomainfrom
worktree-upstream-rebase

Conversation

@Deeds67
Copy link
Collaborator

@Deeds67 Deeds67 commented Mar 17, 2026

Summary

  • Rebases 16 fork commits onto latest upstream/main (7 new upstream commits)
  • Resolves 1 conflict: check-pr-template.yml (modify/delete — kept our deletion)
  • 0 commits behind upstream after rebase

Upstream changes inherited

Fork compatibility

All fork features verified intact: Shared Spaces, Storage Migration, Pet Detection, Image Editing, Branding, Google Photos Import.

Test plan

  • CI passes on this branch
  • Force-push to main after CI is green

🤖 Generated with Claude Code

@Deeds67 Deeds67 added the changelog:skip Skip changelog entry label Mar 17, 2026
@Deeds67 Deeds67 merged commit 5595bfc into main Mar 17, 2026
34 of 36 checks passed
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.

1 participant