From 8dd051ead0698816ec996a7a400c641f6ca33263 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Fri, 5 Nov 2021 13:08:10 +0100 Subject: [PATCH] fix(CONTRIBUTING.md): require specific commit message for fwd/back ports (#577) --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a189dde..676cbe1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -118,7 +118,9 @@ releases should occur on this branch. Subsequent patch releases should also occur on this branch. We have one such branch for each `x.y` release. If there are fixes on `master` that we want to backport, we cherry-pick them into the release branch. Likewise, if we need to -forward port fixes, we cherry-pick them into `master`. +forward port fixes, we cherry-pick them into `master`. When we backport, +the commit message should start with `[backport]`; when we forward +port, the commit message should start with `[forwardport]`. When we branch off release `x.y` from `master`, we also need to bump the `alpha` version used by `master`.