From a329d076f05562ba2723f2fedf12509acd4a7e80 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Fri, 21 Jun 2024 23:54:47 +1000 Subject: [PATCH] Improve dev-facing error message in Git hook install script --- Dist/install_git_hooks.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dist/install_git_hooks.ps1 b/Dist/install_git_hooks.ps1 index 82ebc335b9..370bc20171 100755 --- a/Dist/install_git_hooks.ps1 +++ b/Dist/install_git_hooks.ps1 @@ -12,7 +12,7 @@ if (Test-Path $targetDir -PathType Container) { # is Git repo #TODO use symlinks on Linux } elseif ((Get-FileHash $target).Hash -ne $shimChecksum) { # files differ $head = Get-Content $target -TotalCount 3 - echo "[$PSCommandFilename] found existing Git hook $hook, please resolve conflict manually" + echo "[$PSCommandFilename] found existing Git hook $hook, please resolve conflict manually (ignore if checking out older commits)" exit 1 } # else no-op