Files
skillshare/scripts
Willie 9c048ac7ac fix(ui): show where pull conflict versions differ (#331)
* fix(ui): show where pull conflict versions differ

The pull conflict dialog showed both versions in short 208px panes with no
marking, so users had to scroll and compare long files by eye to find what
actually conflicted.

Panes now use 55vh, lines that only one side has are tinted, each side
scrolls to its first difference, and the header counts differing lines.

* chore(docs): move ai-context router config into wiki/

The router config describes wiki topics, so it belongs next to the pages it
maps; docs/ reads as public documentation. The script is synced with the
upstream router, which also normalizes backslash paths and forces UTF-8
output for Windows consoles.

The router runs on the host rather than the devcontainer, so the kernel now
says to use py or python on Windows when python3 is unavailable.

* fix(ui): give pull conflict panes room and tidy the dialog edges

Short conflicting files still rendered as cramped strips, so panes now keep
a 40vh minimum. A long body scrolled straight under the title, so the header
gets a separator like the footer. The conflict banner's text sat above its
button because notes align to the top for multi-line errors; it is centered
when the message is the fixed conflict text.

* fix(ui): bound the pull conflict line diff

diffLines keeps an n×m table, so two 16 KiB previews that differ on every
line could allocate hundreds of megabytes and freeze the dialog. Matching
leading and trailing lines are now skipped before diffing, and versions whose
differing middle would still need over a million cells are shown unmarked.
2026-10-02 18:40:40 +08:00
..