From ff4218d1d3c696cb6dfb54b40ad465ef4e614c2b Mon Sep 17 00:00:00 2001 From: notnull Date: Thu, 2 Nov 2023 19:10:22 -0400 Subject: [PATCH] dealing with errors --- docs/index.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/index.md b/docs/index.md index 4ecdd61..143a240 100644 --- a/docs/index.md +++ b/docs/index.md @@ -74,3 +74,23 @@ Not sure what this does. I just commented it out and added: I guess the only remaining thing to do is try it! +## Dealing with errors + +So it looks like the hook sends the log of the hook to the local stdout, which is cool! I had some files in it and so it looks like the pull didn't work, but it still built the documents. Might want to build in some error handling, but for now going to try again! + +```shell +remote: From /srv/git/repositories/notnull/git-hooks-demo +remote: * branch master -> FETCH_HEAD +remote: 130a508..cf09d0c master -> origin/master +remote: error: Your local changes to the following files would be overwritten by merge: +remote: mkdocs.yml +remote: Please commit your changes or stash them before you merge. +remote: error: The following untracked working tree files would be overwritten by merge: +remote: .gitignore +remote: update.sh +remote: Please move or remove them before you merge. +remote: Aborting +remote: INFO - Cleaning site directory +remote: INFO - Building documentation to directory: /var/www/services.anarchyplanet.org/public_html +remote: INFO - Documentation built in 0.54 seconds +```