From cc5b5047719668b4e36d9ba70e8cf7896c3b9471 Mon Sep 17 00:00:00 2001 From: Frank <91616163+softhack007@users.noreply.github.com> Date: Wed, 3 Dec 2025 20:36:08 +0100 Subject: [PATCH] Add cherry-picking tip to CONTRIBUTING.md Added a tip about using cherry-picking for copying commits, especially to copy from a local working branch (e.g. ``main``) to the PR branch. --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a809c8fb..d73ba5b7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,6 +26,8 @@ Github will pick up the changes so your PR stays up-to-date. > It has many subtle and unexpected consequences on our github reposistory. > For example, we regularly lost review comments when the PR author force-pushes code changes. So, pretty please, do not force-push. +> [!TIP] +> use [cherry-picking](https://docs.github.com/en/desktop/managing-commits/cherry-picking-a-commit-in-github-desktop) to copy commits from one branch to another. You can find a collection of very useful tips and tricks here: https://github.com/wled-dev/WLED/wiki/How-to-properly-submit-a-PR