From 31606b2febe9b5680cf4fb8e20f26a78dc39ee6e Mon Sep 17 00:00:00 2001 From: Vadim Grinco Date: Mon, 10 Mar 2025 12:49:47 +0100 Subject: [PATCH] Merged in the right direction Signed-off-by: Vadim Grinco --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a31706243..cabb984fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ RUN \ git config user.name "Builder" && git config user.email "builder@local" && \ git remote add ollama_vanilla https://github.com/ollama/ollama.git && \ git fetch ollama_vanilla --tags && git checkout v0.5.13 -b ollama_vanilla_stable && \ - git checkout ollama_vulkan_stable && git merge ollama_vanilla_stable --allow-unrelated-histories --no-edit && \ + git checkout ollama_vanilla_stable && git merge ollama_vulkan_stable --allow-unrelated-histories --no-edit && \ for p in /tmp/patches/*.patch; do patch -p1 < $p; done RUN \ cd "/tmp/ollama-vulkan-git" && \