Re: [PR] feat(runtime-host): attest the bundled npm runtime [maka]

["Astro-Han (via GitHub)" <gi...@apache.org>]

Astro-Han commented on PR #2621:
URL: https://github.com/apache/maka/pull/2621#issuecomment-5384213256

   This branch is `CONFLICTING` against current `main`, so it cannot be reviewed as it stands. **I attempted the rebase for you under maintainer authorization and deliberately stopped**, because the first conflict is one only you can resolve correctly.
   
   `packages/runtime-host/src/server/index.ts`, first commit (`feat(runtime-host): constrain managed npm provisioning`): the `main` side of the conflict is **empty**. `main` has since removed the whole export block — `listener-set`, `websocket-listener`, `access-authority`, `connection-authority` — and that file has gone from 65 lines down to 28. This branch's commit re-adds all of them alongside its own new `managed-dependency-producer-process` export.
   
   **That is not "both sides added something", it is "one side deleted it and the other is still using it."** Taking this branch's version would silently revert an intentional refactor on `main`. Resolving it correctly requires knowing whether your change genuinely depends on those exports or whether it should follow `main` and drop them — and that is your call, not a merge-tool call.
   
   I ran `git rebase --abort`. **Nothing was pushed to your branch.**
   
   The same applies to the stack above it: #2622 (20 commits) and #2623 (30 commits) build on this one, and the first commit here already hits this. Rebasing #2621 first should shrink the other two considerably.
   
   Happy to take another pass at whatever is purely mechanical once the export question is settled — just say so on this thread.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org