From 968dee170de2e2f39151cf0e4a9ff69ee0dcee0f 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6bc52fb8..4d7938b3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,10 +26,13 @@ Github will pick up the changes so your PR stays up-to-date. > [!CAUTION] > Do not use "force-push" while your PR is open! -> It has many subtle and unexpected consequences on our github reposistory. +> It has many subtle and unexpected consequences on our github repository. > For example, we regularly lost review comments when the PR author force-pushes code changes. So, pretty please, do not force-push. -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 +> [!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/WLED/wiki/How-to-properly-submit-a-PR ## Source Code from an AI agent or bot