From c4d72a3668f64c0e243065f14aad25728c9dc8dd Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 24 Jul 2023 09:17:19 +0200 Subject: [PATCH] docs: developer: WORKFLOW: rebase pull requests --- developer/WORKFLOW.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/developer/WORKFLOW.md b/developer/WORKFLOW.md index b1d40b84..dd81ce3a 100644 --- a/developer/WORKFLOW.md +++ b/developer/WORKFLOW.md @@ -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 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 All _Feature branches_ are based on the {vX.Y/,}forgejo-development branch which provides development tools and documentation.