Fix automatic update of the submodule

countzero · countzero · commit 272dab5cd68d · 2023-07-06T12:22:04.000+02:00
diff --git a/README.md b/README.md
@@ -86,7 +86,7 @@ Download a large language model (LLM) with weights in the GGML format into the `
 
 ## Usage
 
-### Chat
+### Chat via CLI
 
 You can now chat with the model:
 
diff --git a/rebuild_llama.cpp.ps1 b/rebuild_llama.cpp.ps1
@@ -54,6 +54,10 @@ function Resolve-UnixPath {
     Write-Output ((Resolve-Path "$path").Path -replace '\\','/')
 }
 
+# We are resetting every submodule to their head prior
+# to updating them to avoid any merge conflicts.
+git submodule foreach --recursive git reset --hard
+
 git submodule update --remote --merge --force
 
 $lines = @(
diff --git a/vendor/llama.cpp b/vendor/llama.cpp
@@ -1 +1 @@
-Subproject commit acc111caf93fc6681450924df9f99679c384c59e
+Subproject commit 31cfbb1013a482e89c72146e2063ac4362becae7

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,10 @@ function Resolve-UnixPath {`
`54`	`54`	`Write-Output ((Resolve-Path "$path").Path -replace '\\','/')`
`55`	`55`	`}`
`56`	`56`
	`57`	`+# We are resetting every submodule to their head prior`
	`58`	`+# to updating them to avoid any merge conflicts.`
	`59`	`+git submodule foreach --recursive git reset --hard`
	`60`	`+`
`57`	`61`	`git submodule update --remote --merge --force`
`58`	`62`
`59`	`63`	`$lines = @(`