From 35de35ffeb4a5c5111d01a007ccf43524755cdec Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Tue, 9 Dec 2025 20:59:50 +0100 Subject: [PATCH] feat(applying-patch): improve documentation to also mention git apply as alternative Signed-off-by: Simon L. --- admin_manual/issues/applying_patch.rst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/admin_manual/issues/applying_patch.rst b/admin_manual/issues/applying_patch.rst index 93cae94b1..691717f6c 100644 --- a/admin_manual/issues/applying_patch.rst +++ b/admin_manual/issues/applying_patch.rst @@ -13,9 +13,10 @@ Patching server patch -p 1 < /path/to/the/file.patch -.. note:: +3. Alternatively, if the patch command is not available, use:: - There can be errors about not found files, especially when you take a patch from GitHub there might be development or test files included in the patch. when the files are in build/ or a tests/ subdirectory it is mostly being + git apply --check /path/to/the/file.diff + git apply /path/to/the/file.diff Patching apps ^^^^^^^^^^^^^ @@ -31,8 +32,12 @@ Reverting a patch patch -R -p 1 < /path/to/the/file.patch -Getting a patch from a GitHub pull request ------------------------------------------- +3. Alternatively, if the patch command is not available, use:: + + git apply --reverse /path/to/the/file.diff + +Notes and troubleshooting +------------------------- If you found a related pull request on GitHub that solves your issue, or you want to help developers and verify a fix works, you can get a patch for the pull request.