Skip to content

sync: repair batch 001 ancestry#3

Merged
pRizz merged 1166 commits intodevfrom
sync/repair-batch001-ancestry
Feb 6, 2026
Merged

sync: repair batch 001 ancestry#3
pRizz merged 1166 commits intodevfrom
sync/repair-batch001-ancestry

Conversation

@pRizz
Copy link
Owner

@pRizz pRizz commented Feb 6, 2026

Records upstream boundary commit 43354eeabd0497ffdbd0f5d4d457205ed7f03537 as an ancestor of dev using an ours merge commit so the merge train can continue from Batch 002 without reverting the squash merge.

ideallove and others added 30 commits January 28, 2026 21:28
…del ids (anomalyco#11095)

Co-authored-by: aptdnfapt <aptdnfapt@users.noreply.github.com>
…models on copilot due to ratelimiting issues, go back to completions endpoint instead
Co-authored-by: Brendan Allan <git@brendonovich.dev>
…omalyco#11118)

Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
…ow it as autocomplete option (this is already a respected setting)
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: opencode <opencode@sst.dev>
thdxr and others added 26 commits February 1, 2026 19:59
Remove pull_request trigger and limit push trigger to dev branch to prevent

unnecessary workflow runs on feature branches and PRs. The workflow will now

only execute when dependency files change on the dev branch.
Added a workaround to fix Pulumi version conflict in the deployment workflow.
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
@pRizz pRizz added the sync Automated upstream syncs label Feb 6, 2026
@github-actions
Copy link

github-actions bot commented Feb 6, 2026

Hey! Your PR title sync: repair batch 001 ancestry doesn't follow conventional commit format.

Please update it to start with one of:

  • feat: or feat(scope): new feature
  • fix: or fix(scope): bug fix
  • docs: or docs(scope): documentation changes
  • chore: or chore(scope): maintenance tasks
  • refactor: or refactor(scope): code refactoring
  • test: or test(scope): adding or updating tests

Where scope is the package name (e.g., app, desktop, opencode).

See CONTRIBUTING.md for details.

@pRizz pRizz merged commit 4295d21 into dev Feb 6, 2026
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs:title sync Automated upstream syncs

Projects

None yet

Development

Successfully merging this pull request may close these issues.