Create shared branch in Fedora forgejo fork #464

New issue

Closed

opened 2026-03-19 09:26:46 +00:00 by humaton · 3 comments

humaton commented

2026-03-19 09:26:46 +00:00

Owner

Story

As a developer working on private issues,
I want that a shared branch exists in our fork of the forgejo code,
so we have a place to consolidate changes we work on as a team.

Acceptance Criteria

A branch exists for downstream changes around private issues, to be kept there until they are integrated upstream
The relevant people of the team have discussed how to coordinate changes in this branch, and this is documented somewhere (👇 down here).

Background

So far, @nphilipp worked on changes to the backend and maintained them in his own fork+branch. It would be better to have a shared space so others from the team can contribute (and that private space doesn’t become a bottleneck or blocker).

Coordinating changes

Collect the changes we want to submit upstream in the private-issues branch of our fork, which is forked off the upstream forgejo branch.
Submit additions to that branch as PRs.
This branch will be in a constant state of flux:
- Regular rebases on top of the upstream forgejo branch.
- Aiming to keep commits in a logical order, where foundational changes come first, then changes building on them and so forth, e.g. backend changes “underneath” frontend changes (because the latter depend on the former), requires “shuffling” commits to the right place in the history. This is to allow piecemeal submission to upstream.

# Story As a developer working on private issues, I want that a shared branch exists in our fork of the `forgejo` code, so we have a place to consolidate changes we work on as a team. # Acceptance Criteria - [x] A branch exists for downstream changes around private issues, to be kept there until they are integrated upstream - [x] The relevant people of the team have discussed how to coordinate changes in this branch, and this is documented somewhere (👇 down here). # Background So far, @nphilipp worked on changes to the backend and maintained them in his own [fork+branch](https://codeberg.org/nilsph/forgejo/src/branch/forgejo--private-issues). It would be better to have a shared space so others from the team can contribute (and that private space doesn’t become a bottleneck or blocker). # Coordinating changes - Collect the changes we want to submit upstream in the [`private-issues`](https://codeberg.org/fedora/forgejo/src/branch/private-issues) branch of [our fork](https://codeberg.org/fedora/forgejo), which is forked off the upstream `forgejo` branch. - Submit additions to that branch as PRs. - This branch will be in a constant state of flux: - Regular rebases on top of the upstream `forgejo` branch. - Aiming to keep commits in a logical order, where foundational changes come first, then changes building on them and so forth, e.g. backend changes “underneath” frontend changes (because the latter depend on the former), requires “shuffling” commits to the right place in the history. This is to allow piecemeal submission to upstream.