From 08f924b4912252f23b9ed24411a1fcbe637449d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Cerveau?= Date: Fri, 8 Oct 2021 13:20:37 +0200 Subject: [PATCH] FAQ: add mention to downstream cherry-pick Give an help to cherry-pick an upstream patch to downstream repository (old stable version) Part-of: --- .../markdown/frequently-asked-questions/mono-repository.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/subprojects/gst-docs/markdown/frequently-asked-questions/mono-repository.md b/subprojects/gst-docs/markdown/frequently-asked-questions/mono-repository.md index 9e9a4a4..dc2667e 100644 --- a/subprojects/gst-docs/markdown/frequently-asked-questions/mono-repository.md +++ b/subprojects/gst-docs/markdown/frequently-asked-questions/mono-repository.md @@ -183,6 +183,14 @@ We may remove the "master" branch at some point in future. You can still build each GStreamer module individually by changing into the `subprojects/$gst_module` directory and then running Meson with that directory as the source directory. +## I want to cherry-pick a patch from the upstream mono repository into my <= 1.18 repository: + +As the subtree changed in the monorepo organization (ie subprojects/gst-pluigns-xx), you can give a try to the following git command to resolve the path conflict: + +``` +$ git cherry-pick ... --strategy=subtree +``` + ## I have another question related to the mono repository - where is the best place to ask or get help? Best to just pop into our IRC channel `#gstreamer` on the OFTC network (also accessible via Matrix) or send a mail to the gstreamer-devel mailing list. -- 2.7.4