From 46cc6ab2a202421220a8fe1119bb4100e63a29c5 Mon Sep 17 00:00:00 2001
From: Kevin Heis <heiskr@users.noreply.github.com>
Date: Wed, 28 Jul 2021 11:13:43 -0700
Subject: [PATCH] Update post-merge

---
 .husky/post-merge | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.husky/post-merge b/.husky/post-merge
index 828b70891e..12ce97f1f6 100755
--- a/.husky/post-merge
+++ b/.husky/post-merge
@@ -1,3 +1,3 @@
 #!/bin/sh
-command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-merge.\n"; exit 2; }
-git lfs post-merge "$@"
+[ -n "$CI" ] && exit 0
+command -v git-lfs >/dev/null 2>&1 && git lfs post-merge "$@" || { echo >&2 "\nGitHub Docs requires Git LFS but 'git-lfs' was not found on your path.\nLearn how to install Git LFS at <https://git.io/JBCId>.\n"; }