q9i/gtl-mexico
1
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Refactor for multi-document monorepo format #1

Open
youwen wants to merge 1 commit from youwen/gtl-mexico:main into main
pull from: youwen/gtl-mexico:main
merge into: q9i:main
Conversation 1 Commits 1 Files changed 80 +2958 -150602
youwen commented 2026-01-08 01:25:08 -08:00
Collaborator
Copy link

This uses technology from bookworm.

This uses technology from [bookworm](https://code.functor.systems/youwen/bookworm).
q9i commented 2026-01-09 19:46:18 -08:00
Owner
Copy link

it MIGHT be over; will need to review this in greater detail

it MIGHT be over; will need to review this in greater detail
This pull request has changes conflicting with the target branch.
  • documents/wk1/intro/assets/img/california.webp
  • documents/wk1/intro/assets/img/ethiopia.svg
  • documents/wk1/intro/assets/img/india.png
  • documents/wk1/intro/assets/img/mit/dome/dome-display.jpeg
  • documents/wk1/intro/assets/img/mit/dome/dome-fall.jpeg
  • documents/wk1/intro/assets/img/mit/dome/dome-spring.jpeg
  • documents/wk1/intro/assets/img/mit/dome/dome-summer.jpeg
  • documents/wk1/intro/assets/img/mit/dome/dome-winter.jpeg
  • documents/wk1/intro/assets/img/mit/events/mithenge.jpeg
  • documents/wk1/intro/assets/img/mit/events/pumpkin-drop.jpeg
  • documents/wk1/intro/assets/img/mit/events/windmill.jpeg
  • documents/wk1/intro/assets/img/mit/macgregor/macgregor-campus-view-window.jpeg
  • documents/wk1/intro/assets/img/mit/macgregor/macgregor-dorm-row.jpeg
  • documents/wk1/intro/assets/img/mit/macgregor/macgregor-field-view.jpeg
  • documents/wk1/intro/assets/img/mit/macgregor/macgregor-lowrise.jpeg
  • documents/wk1/intro/assets/img/mit/macgregor/macgregor-mural.jpeg
  • documents/wk1/intro/assets/img/mit/macgregor/macgregor-river-view.jpeg
  • documents/wk1/intro/assets/img/mit/macgregor/macgregor-self-view.jpeg
  • documents/wk1/intro/assets/img/mit/macgregor/macgregor-simmons-view.jpeg
  • documents/wk1/intro/assets/img/mit/macgregor/macgregor-tunnels.jpeg
  • documents/wk1/intro/assets/img/mit/murals/borderline1.jpeg
  • documents/wk1/intro/assets/img/mit/murals/borderline2.jpeg
  • documents/wk1/intro/assets/img/mit/murals/simmons-mural.jpeg
  • documents/wk1/intro/assets/img/mit/places/mitmuseum.jpeg
  • documents/wk1/intro/assets/img/mit/places/onemit.jpeg
  • documents/wk1/intro/assets/img/mit/places/simmons-ballpit.jpeg
  • documents/wk1/intro/assets/img/mit/snow/river-ice.jpeg
  • documents/wk1/intro/assets/img/mit/snow/trail-snow.jpeg
  • documents/wk1/intro/assets/img/mit/stata/stata-back.jpeg
  • documents/wk1/intro/assets/img/mit/stata/stata-fall.jpg
  • documents/wk1/intro/assets/img/mit/stata/stata-fourth.jpeg
  • documents/wk1/intro/assets/img/mit/stata/stata-ninth.jpeg
  • documents/wk1/intro/assets/img/mit/stata/stata-outside.jpeg
  • documents/wk1/intro/assets/img/mit/stata/stata-snow.jpeg
  • documents/wk1/intro/assets/img/mit/tunnels/blue-light.jpeg
  • documents/wk1/intro/assets/img/mit/tunnels/descent.jpeg
  • documents/wk1/intro/assets/img/mit/tunnels/empty-space.jpeg
  • documents/wk1/intro/assets/img/mit/tunnels/hacker-map.jpeg
  • documents/wk1/intro/assets/img/mit/tunnels/hallway.jpeg
  • documents/wk1/intro/assets/img/mit/tunnels/lights.jpeg
  • documents/wk1/intro/assets/img/mit/tunnels/roof.jpeg
  • documents/wk1/intro/assets/img/mit/tunnels/vending.jpeg
  • documents/wk1/intro/assets/img/mit/tunnels/winding.jpeg
  • documents/wk1/intro/assets/img/schedule.png
  • documents/wk1/intro/assets/img/srvhs.jpeg
  • documents/wk1/intro/assets/img/travels.png
  • documents/wk1/intro/assets/img/zardini-hike.jpg
  • documents/wk1/intro/assets/img/zardini-restaurant.jpg
  • documents/wk1/intro/assets/img/zardini-van.jpg
  • documents/wk1/intro/assets/img/zardini-xmas.jpg
  • documents/wk1/ws1/main.typ
  • flake.lock
  • wk1/intro/main.pdf
  • wk1/ws1/flake.lock
  • wk1/ws1/notes/flake.lock
  • wk1/ws1/notes/flake.nix
  • wk1/ws3/.envrc
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u main:youwen-main
git switch youwen-main

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff youwen-main
git switch youwen-main
git rebase main
git switch main
git merge --ff-only youwen-main
git switch youwen-main
git rebase main
git switch main
git merge --no-ff youwen-main
git switch main
git merge --squash youwen-main
git switch main
git merge --ff-only youwen-main
git switch main
git merge youwen-main
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
q9i/gtl-mexico!1
No description provided.