From 0175fe8219a2a6843d1701539ca167dfd45d2b7f Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Thu, 13 Jul 2023 09:26:12 +0300 Subject: [PATCH] Explaining hiredis upgrade --- deps/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deps/README.md b/deps/README.md index 6d434c21f3c..8da051baa79 100644 --- a/deps/README.md +++ b/deps/README.md @@ -63,6 +63,10 @@ Hiredis Hiredis is used by Sentinel, `redis-cli` and `redis-benchmark`. Like Redis, uses the SDS string library, but not necessarily the same version. In order to avoid conflicts, this version has all SDS identifiers prefixed by `hi`. +1. `git subtree pull --prefix deps/hiredis https://github.com/redis/hiredis.git --squash`
+This should hopefully merge the local changes into the new version. +2. Conflicts will arise (due to our changes) you'll need to resolve them and commit. + Linenoise ---