foster/forgejo-docs
0
0
Fork 0
mirror of https://codeberg.org/forgejo/docs.git synced 2024-11-28 18:42:51 -05:00
Code Issues Activity

docs: developer: WORKFLOW: rebase pull requests

Browse source
This commit is contained in:
Earl Warren 2023-07-24 09:17:19 +02:00 committed by Caesar Schinas
parent 19ec284d9b
commit c4d72a3668
No known key found for this signature in database
GPG key ID: AE9108461BEA5ACF
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
developer/WORKFLOW.md
View file

@ -62,6 +62,10 @@ _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 commit because there would be no convenient way to know why and how it
happened when browing the commit history. happened when browing the commit history.
To improve the readability of the git history, pull requests to stable
branches are rebased on top of the branch instead of being merged. It
saves one merge commit and creates a linear history.
## Feature branches ## Feature branches
All _Feature branches_ are based on the {vX.Y/,}forgejo-development branch which provides development tools and documentation. All _Feature branches_ are based on the {vX.Y/,}forgejo-development branch which provides development tools and documentation.