Skip to content

Commit 35de35f

Browse files
committed
feat(applying-patch): improve documentation to also mention git apply as alternative
Signed-off-by: Simon L. <szaimen@e.mail.de>
1 parent 780992e commit 35de35f

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

admin_manual/issues/applying_patch.rst

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ Patching server
1313

1414
patch -p 1 < /path/to/the/file.patch
1515

16-
.. note::
16+
3. Alternatively, if the patch command is not available, use::
1717

18-
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
18+
git apply --check /path/to/the/file.diff
19+
git apply /path/to/the/file.diff
1920

2021
Patching apps
2122
^^^^^^^^^^^^^
@@ -31,8 +32,12 @@ Reverting a patch
3132

3233
patch -R -p 1 < /path/to/the/file.patch
3334

34-
Getting a patch from a GitHub pull request
35-
------------------------------------------
35+
3. Alternatively, if the patch command is not available, use::
36+
37+
git apply --reverse /path/to/the/file.diff
38+
39+
Notes and troubleshooting
40+
-------------------------
3641

3742
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.
3843

0 commit comments

Comments
 (0)