Re: [PR] feat(tui): trial an anchored composer in fullscreen mode on nightly [maka]

["abhinav-phi (via GitHub)" <gi...@apache.org>]

abhinav-phi commented on PR #4221:
URL: https://github.com/apache/maka/pull/4221#issuecomment-5498451105

   Resolving the merge conflict with `upstream/main` (`ad38322e9`)
   
   Upstream's localized-copy work (#4214) landed while this PR was open and started inserting its `UiLocale` import in the same diff gap in `packages/cli/src/pi-tui-layout.ts` where this PR had appended its `ScrollView` import, which made the PR unmergeable.
   
   Commit `ad38322e9` fixes this with a one-line restructuring and **no behavior change**: the `ScrollView` import moves out of the `Container` import statement into its own statement, anchored just below the existing `normalizeTerminalOutput` deep import. Upstream inserts its import directly after the `Container` line, so the two changes now touch different gaps and the three-way merge resolves on its own.
   
   Verified with `git merge-tree --write-tree upstream/main HEAD`, which now returns a conflict-free tree containing both upstream's `UiLocale` wiring and this PR's fullscreen components (the pending-queue locale wiring in `pi-tui-runner.ts` is intact in the merged result). The PR branch is again mergeable as-is; a maintainer "Update branch" (or the merge itself) will bring in upstream's commits.


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