foster/forgejo-docs
0
0
Fork 0
mirror of https://codeberg.org/forgejo/docs.git synced 2024-12-24 22:32:43 -05:00
Code Issues Activity

docs: developer: workflow: preserving stable branch tags (simplification)

Browse source
This commit is contained in:
Loïc Dachary 2023-07-16 10:21:34 +02:00 committed by Caesar Schinas
parent 0589ab311b
commit f29939c244
No known key found for this signature in database
GPG key ID: AE9108461BEA5ACF
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
developer/WORKFLOW.md
View file

@ -48,12 +48,19 @@ and it is force pushed.
### Stable branches
The stable branches cannot be force pushed because they would no
The stable branches are not force pushed because they would no
longer contain the tags from which releases were made. Instead, the following is done:
- All _Forgejo_ commits are reverted
- The Gitea branch is merged
- All _Feature branches_ are merged
- The _Gitea_ commits are cherry-picked
- If there is a conflict
- revert the _Forgejo_ commit that caused the conflict
- cherry-pick the _Gitea_ commit
- cherry-pick the _Forgejo_ commit back and resolve the conflict
This ensures the conflict resolution is documented in the relevant
_Forgejo_ commit. The conflict must not be resolved in the _Gitea_
commit because there would be no convenient way to know why and how it
happened when browing the commit history.
## Feature branches