branderson/dotcom-arcade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add upstream sync process and agent notes #13

Merged
branderson merged 2 commits from upstream-sync-process into main 2026-10-15 16:36:57 -07:00
Conversation 1 Commits 2 Files Changed 5
+185
dejima-agent commented 2026-10-15 16:31:08 -07:00
Collaborator
Copy Link
Copy Source

Summary generated by LLM agent

Makes the connection to upstream flashpoint-web easier to keep up, so the two projects don't drift apart.

  • scripts/upstream-status.sh fetches upstream master and lists the new commits since the last merge. It sorts every file they touch by where this project stands on it: unchanged here, changed here, removed here, or new upstream. The only thing it changes is the refs/remotes/upstream/master ref.
  • docs/08-development/upstream-sync.md sets out the process:
    • when to check;
    • how to merge on a branch;
    • how to resolve each kind of conflict, keeping our branding and the features we removed;
    • migration naming;
    • what to verify;
    • merging the sync PR with a merge commit, so the next run knows the last sync point.
  • .dejima.md tells agents running in dejima that this is a heavily modified fork, where upstream lives, and how to sync. It also covers the CI runner labels and the rule against hardcoding the forge host.

Testing: against the real upstream, the script reports up to date at c12255c. Against a fake upstream commit it sorted each kind of file correctly. shellcheck passes.

**Summary generated by LLM agent** Makes the connection to upstream flashpoint-web easier to keep up, so the two projects don't drift apart. - `scripts/upstream-status.sh` fetches upstream `master` and lists the new commits since the last merge. It sorts every file they touch by where this project stands on it: unchanged here, changed here, removed here, or new upstream. The only thing it changes is the `refs/remotes/upstream/master` ref. - `docs/08-development/upstream-sync.md` sets out the process: - when to check; - how to merge on a branch; - how to resolve each kind of conflict, keeping our branding and the features we removed; - migration naming; - what to verify; - merging the sync PR with a merge commit, so the next run knows the last sync point. - `.dejima.md` tells agents running in dejima that this is a heavily modified fork, where upstream lives, and how to sync. It also covers the CI runner labels and the rule against hardcoding the forge host. Testing: against the real upstream, the script reports up to date at `c12255c`. Against a fake upstream commit it sorted each kind of file correctly. shellcheck passes.
dejima-agent added 1 commit 2026-10-15 16:31:09 -07:00
docs: add upstream sync process and agent notes 4fd43cd17d 
Adds scripts/upstream-status.sh to report upstream flashpoint-web changes
since the last merge, docs/08-development/upstream-sync.md describing the
merge process, and .dejima.md for agents working in dejima.
dejima-agent added 1 commit 2026-10-15 16:36:12 -07:00
docs: don't pin our migration numbers in sync notes 13a7fd9d19
branderson approved these changes 2026-10-15 16:36:51 -07:00
branderson merged commit 3c3bb5dfbf into main 2026-10-15 16:36:57 -07:00
Sign in to join this conversation.
Reviewers
No Reviewers
branderson
Labels
No items
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
dejima-agent branderson
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: branderson/dotcom-arcade#13