From: Stéphane Cerveau <scerveau@collabora.com>
Date: Fri, 8 Oct 2021 11:20:37 +0000 (+0200)
Subject: FAQ: add mention to downstream cherry-pick
X-Git-Tag: 1.19.3~324
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08f924b4912252f23b9ed24411a1fcbe637449d7;p=platform%2Fupstream%2Fgstreamer.git

FAQ: add mention to downstream cherry-pick

Give an help to cherry-pick an upstream patch to
downstream repository (old stable version)

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1095>
---

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 <commit> ... --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.