nsaspy/zara
1
0
Fork 0
Code Issues 95 Pull requests 18 Projects Releases Packages Wiki Activity Actions

RAGE #264 recovery helper: merge task config/host delta #247

Open
nsaspy wants to merge 1 commit from rage/264-config-host-delta into feature/long-horizon-tasks
pull from: rage/264-config-host-delta
merge into: nsaspy:feature/long-horizon-tasks
Conversation 0 Commits 1 Files changed 2 +197
nsaspy commented 2026-09-04 22:43:48 +00:00
Owner
Copy link

Recovery-only helper PR. It contains exactly the original #264 additive changes to zara/config.py and zara/runtime/host.py, reconstructed on their historical base. Base is the recovered feature/long-horizon-tasks branch so Git can perform a three-way merge and preserve all newer Zara hook/voice/runtime changes. This helper is not intended for master; it exists solely to complete #264's conflict-aware rebase.

Recovery-only helper PR. It contains exactly the original #264 additive changes to `zara/config.py` and `zara/runtime/host.py`, reconstructed on their historical base. Base is the recovered `feature/long-horizon-tasks` branch so Git can perform a three-way merge and preserve all newer Zara hook/voice/runtime changes. This helper is not intended for `master`; it exists solely to complete #264's conflict-aware rebase.
RAGE #264: isolate historical task config/host delta
Some checks failed
CI / test (pull_request) Failing after 4s
Details
CI / android skeleton gate (pull_request) Failing after 8s
Details
CI / shared mic / Ubuntu 24.04 (pull_request) Failing after 6m10s
Details
CI / shared mic / Arch Linux (pull_request) Failing after 9m59s
Details
41de113f77 
Reconstruct only the original long-horizon task additions to ZaraConfig and RuntimeHost on their historical base so Git can three-way merge those additive deltas onto the recovered current-master branch without overwriting newer hook/voice/runtime work.
Some checks failed
CI / test (pull_request) Failing after 4s
Details
CI / android skeleton gate (pull_request) Failing after 8s
Details
CI / shared mic / Ubuntu 24.04 (pull_request) Failing after 6m10s
Details
CI / shared mic / Arch Linux (pull_request) Failing after 9m59s
Details
This pull request has changes conflicting with the target branch.
  • zara/runtime/host.py
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin rage/264-config-host-delta:rage/264-config-host-delta
git switch rage/264-config-host-delta

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch feature/long-horizon-tasks
git merge --no-ff rage/264-config-host-delta
git switch rage/264-config-host-delta
git rebase feature/long-horizon-tasks
git switch feature/long-horizon-tasks
git merge --ff-only rage/264-config-host-delta
git switch rage/264-config-host-delta
git rebase feature/long-horizon-tasks
git switch feature/long-horizon-tasks
git merge --no-ff rage/264-config-host-delta
git switch feature/long-horizon-tasks
git merge --squash rage/264-config-host-delta
git switch feature/long-horizon-tasks
git merge --ff-only rage/264-config-host-delta
git switch feature/long-horizon-tasks
git merge rage/264-config-host-delta
git push origin feature/long-horizon-tasks
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug
Something isn't working

  
documentation
Improvements or additions to documentation

  
duplicate
This issue or pull request already exists

  
enhancement
New feature or request

  
good first issue
Good for newcomers

  
help wanted
Extra attention is needed

  
invalid
This doesn't seem right

  
question
Further information is requested

  
wontfix
This will not be worked on

No labels
bug
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
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
nsaspy/zara!247
No description provided.