Re: [PR] fix(eval): harden external prompt and admission handling [maka]

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

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

   Hi — this PR **conflicts with current `main`** and cannot be merged as-is.
   
   I tested a rebase onto current `main` locally (in a throwaway worktree — your branch was not touched). It stops on these files:
   
   - `packages/eval/src/harbor-external-subject.ts`
   
   These are real source conflicts, so they need your judgement rather than a mechanical rebase — please rebase onto current `main` and resolve them yourself, then push. Once the branch is conflict-free and CI is green on the new head, I will pick it up for review.
   
   ```
   git fetch upstream && git rebase upstream/main
   # resolve, then
   git push --force-with-lease
   ```
   
   Thanks for the contribution — happy to help if any conflict is unclear.
   
   ---
   *AI-assisted maintenance note, not a review. It does not count as the required human review under `CONTRIBUTING.md` §Review.*


-- 
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