From f860c2b4ca27752741cc8f7f1eae03b624a4f269 Mon Sep 17 00:00:00 2001 From: /rootzoll Date: Thu, 17 Nov 2022 13:26:28 +0100 Subject: [PATCH] more testdev notes (#3452) adding dev notes on branch protection --- FAQ.dev.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/FAQ.dev.md b/FAQ.dev.md index d651e3260..b73587f51 100644 --- a/FAQ.dev.md +++ b/FAQ.dev.md @@ -188,4 +188,10 @@ To change back to the code: ### How can I push changes to an existing Pull Request? -See article: https://tech.sycamore.garden/add-commit-push-contributor-branch-git-github .. only works if your a contributer on raspiblitz repo. \ No newline at end of file +See article: https://tech.sycamore.garden/add-commit-push-contributor-branch-git-github .. only works if your a contributer on raspiblitz repo. + +### How to cherry-pick with branch protections & CODEOWNERS file? + +Chery-picking patch PRs from dev to a release-branch like 'v1.8' (for example) is now a bit more complicated. Either an admin switches temorarly the branch protection "require a pull request before merging" setting off for the `git cherry-pick` OR we create a `p1.8` branch from `v1.8`, cherry-pick the squashed patch PR into that unprotected `p1.8` and then open a PR back to `v1.8`. + +But what we gain is that better branch protection and we can add more contributers to the project that are allowed to manage issues - like adding lables or closing.