From e604f1fc88897b8e7cb5ecadb0469d3700d0c949 Mon Sep 17 00:00:00 2001 From: olivier Date: Wed, 3 May 2023 15:20:51 +0200 Subject: [PATCH] update patches path --- patches/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/README.md b/patches/README.md index 4d35725ee..221a15ad7 100644 --- a/patches/README.md +++ b/patches/README.md @@ -13,7 +13,7 @@ Note : if you are making a patch while your local env has yarn links, patch-pack First run the merge command, it takes long if you have multiple patches ``` -bash ./scripts/merge-patches.sh merge +bash ./scripts/tchap/merge-patches.sh merge ``` If some patches are in conflict, a folder is created in patches_temp/ @@ -21,13 +21,13 @@ If some patches are in conflict, a folder is created in patches_temp/ To see the conflicted files run : ``` -bash ./scripts/merge-patches.sh continue /tchap-web-v4/patches_temp/PATCH_NAME +bash ./scripts/tchap/merge-patches.sh continue /tchap-web-v4/patches_temp/PATCH_NAME ``` Fix the conlicts inside the /tchap-web-v4/patches_temp/PATCH_NAME/node_modules/.... After the conflict is solved, run again -bash ./scripts/merge-patches.sh continue /tchap-web-v4/patches_temp/PATCH_NAME +bash ./scripts/tchap/merge-patches.sh continue /tchap-web-v4/patches_temp/PATCH_NAME A notice should be in the log that a new patch has been created in folder : absolute_path>/tchap-web-v4/patches/ @@ -36,7 +36,7 @@ Compare the old patch and the new patch, if it looks ok to you then delete manua NB : merge command can be used with only one patch also ``` -bash ./scripts/merge-patches.sh merge /tchap-web-v4/patches/PATCH_NAME/PATCH_FILE.patch +bash ./scripts/tchap/merge-patches.sh merge /tchap-web-v4/patches/PATCH_NAME/PATCH_FILE.patch ``` ## How to deal with patch conflicts