Make repo fork-save #1

2026-06-26T15:22:02+02:00

zimoch commented

2026-06-26 15:22:02 +02:00

If this repo is forked, push the rendered pages to the forked repo, not to the original.
Also make sure the rendered gitea link points to the forked repo.

If this repo is forked, push the rendered pages to the forked repo, not to the original. Also make sure the rendered gitea link points to the forked repo.

zimoch commented

2026-06-26 15:52:57 +02:00

This could help if many people are working on documentation at the same time (a.k.a. documentathon). In order not to step on each other's feet with git pushes and maybe/likely zensical redering errors, people can create their own fork in their own name space. ([Fork] button in top right corner)
For example if the repo is forked to user/controls-docs, then the private copy of the rendered page should appear as https://user.controls-docs.pages.psi.ch. (I recommend to change the repo name for the fork and not to keep the name "gitea-pages" because then it would become the main web page of the user at URL https://user.pages.psi.ch, just like it is the main web page of this organization, and may conflict with a gitea page the user already has.)
Once everything renders correctly, users can create a merge request to get their contribution back into the original (this) repo.
For the maintainer of this repo, I suggest to use merge option "rebase and feed-forward" (to keep each commit visible in the history) or "squash commit" (to collapse all commits into one, i.e. avoid dozens of render-fail-try-again-commits showing in the history) if available. As long as not two contributors have edited the same line in the same file, it should merge without conflict.

This could help if many people are working on documentation at the same time (a.k.a. documentathon). In order not to step on each other's feet with git pushes and maybe/likely zensical redering errors, people can create their own fork in their own name space. ([Fork] button in top right corner) For example if the repo is forked to **_user_/controls-docs**, then the private copy of the rendered page should appear as **https://_user_.controls-docs.pages.psi.ch**. (I recommend to change the repo name for the fork and not to keep the name "gitea-pages" because then it would become the main web page of the user at URL **https://_user_.pages.psi.ch**, just like it is the main web page of this organization, and may conflict with a gitea page the user already has.) Once everything renders correctly, users can create a merge request to get their contribution back into the original (this) repo. For the maintainer of this repo, I suggest to use merge option "rebase and feed-forward" (to keep each commit visible in the history) or "squash commit" (to collapse all commits into one, i.e. avoid dozens of render-fail-try-again-commits showing in the history) if available. As long as not two contributors have edited the same line in the same file, it should merge without conflict.

zimoch added 1 commit 2026-06-26 16:07:12 +02:00

Make repo fork-save ee77a28819

If this repo is forked, push the rendered pages to the forked repo,
not to the original.
Also make sure the rendered gitea link points to the forked repo.

zimoch force-pushed master from 531b3ccc83 to ee77a28819

2026-06-26 16:07:12 +02:00

Compare

You are not authorized to merge this pull request.

This pull request can be merged automatically.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u https://gitea.psi.ch/zimoch/Controls-docs master:zimoch-master

git checkout zimoch-master

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Controls/gitea-pages#1

Allow edits from maintainers