mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 13:16:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

FAQ: add mention to downstream cherry-pick

Browse source 
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>
This commit is contained in:
Stéphane Cerveau 2021-10-08 13:20:37 +02:00
parent 7286c8e302
commit 08f924b491
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
subprojects/gst-docs/markdown/frequently-asked-questions/mono-repository.md
View file

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