Skip to content

armgit / bento

Public Imported from GitHub
0

Bento, the office suite that fits in a file

Merge remote-tracking branch 'origin/main' into pr87-tray-android

nyblnete2bd39a39197
diff --cc .gitignore
index 20351893,1b0d2de8..d8cac51f
--- a/.gitignore
+++ b/.gitignore
@@@ -27,13 -43,16 +43,27 @@@ release-key.jso
# make-og.mjs intermediate (the SVG rasterised into site-src/og.png)
scripts/.cache/
+# native wrapper apps (native/)
+native/*/build/
+native/android/.gradle/
+native/android/app/build/
+native/android/local.properties
+native/android/keystore.properties
+native/ios/Bento/Resources/bento.html
+native/android/app/src/main/assets/bento.html
- *.xcuserdatad/
+native/PR-BODY.md
++*.xcuserdatad/
++
+ # tray: generated by xcodegen and by the slides build. The paths moved when
+ # tray/BentoTray/ was renamed to tray/ios/, which silently unignored them and
+ # let a broad `git add` sweep them into an unrelated PR. That happened twice —
+ # an earlier ios/BentoHost/ copy carried a 587KB built shell in main until
+ # 2026-07-27 — so these are matched ANYWHERE, not at a fixed path: a future
+ # rename must not be able to unignore them again.
+ **/*.xcodeproj/
+ **/Resources/starter.bento.html
+
+ # per-session git worktrees (docs/PARALLEL-WORK.md §2.1). Inside the repo on
+ # purpose: ~/.zshrc picks the personal gh account by directory, and /tmp gets
+ # reaped — seven worktrees were lost from it in one day.
+ .worktrees/