I started with the version of this page in fed.wiki.org. Upon examining the merge I see that some non-visible edits were done independent of that version. We're careful not to include forks in the journal because that makes it impossible to start alone in the neighborhood. I favor going ahead and merging with these unintended diffs.
I can recommend a new workflow for editing default-data/pages:
make sure fed.wiki.org is running a current wiki-server
delete the pages in question to expose those in the default-data
edit as normal
show json and then copy-paste to the working directory for the repo
I started with the version of this page in fed.wiki.org. Upon examining the merge I see that some non-visible edits were done independent of that version. We're careful not to include forks in the journal because that makes it impossible to start alone in the neighborhood. I favor going ahead and merging with these unintended diffs.
I can recommend a new workflow for editing default-data/pages: