23-06-2022 (22:13:53) === ERROR: No token detected === *** ACCESS DENIED *** 23-06-2022 (22:14:48) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/master` === 23-06-2022 (22:16:18) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 23-06-2022 (22:16:19) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 23-06-2022 (22:16:19) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 23-06-2022 (22:16:19) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 23-06-2022 (22:16:20) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 23-06-2022 (22:16:20) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 23-06-2022 (22:22:58) === ERROR: No token detected === *** ACCESS DENIED *** 23-06-2022 (22:29:49) === ERROR: No token detected === *** ACCESS DENIED *** 23-06-2022 (22:31:36) === ERROR: X-GitLab-Token does not match TOKEN === *** ACCESS DENIED *** 23-06-2022 (22:32:39) {"object_kind":"push","event_name":"push","before":"a5207711cf1a5a0bb857c92a83f7b392249e21e4","after":"a9ab6aa230b18ae1a0652d5b775930220a783040","ref":"refs/heads/live","checkout_sha":"a9ab6aa230b18ae1a0652d5b775930220a783040","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"a9ab6aa230b18ae1a0652d5b775930220a783040","message":"Weddding landing page\n","title":"Weddding landing page","timestamp":"2022-06-21T17:44:42-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/a9ab6aa230b18ae1a0652d5b775930220a783040","author":{"name":"Edward Sandor","email":"ed@ewsandor.com"},"added":["www/wedding/index.html"],"modified":[],"removed":[]},{"id":"d8c55b3b9e88dc34a46a515c87a6c246006d5b91","message":"Publishing script to install Sandor Laboratories CA on Fedora Linux\n","title":"Publishing script to install Sandor Laboratories CA on Fedora Linux","timestamp":"2022-04-06T21:38:57-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/d8c55b3b9e88dc34a46a515c87a6c246006d5b91","author":{"name":"Ed Sandor","email":"ed@ewsandor.com"},"added":["ca_sandor_laboratories/install_ca_fedora.sh"],"modified":[],"removed":[]},{"id":"a5207711cf1a5a0bb857c92a83f7b392249e21e4","message":"Updated Intermediate CA CRL\n","title":"Updated Intermediate CA CRL","timestamp":"2021-10-06T15:12:41-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/a5207711cf1a5a0bb857c92a83f7b392249e21e4","author":{"name":"Ed Sandor","email":"ed@ewsandor.com"},"added":[],"modified":["ca_sandor_laboratories/crl/sandor_laboratories_intermediate_ca_edward_sandor.crl"],"removed":[]}],"total_commits_count":3,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} === ERROR: DIR `/var/www/sandorlaboratories.com` does not exist === 23-06-2022 (22:33:14) {"object_kind":"push","event_name":"push","before":"a5207711cf1a5a0bb857c92a83f7b392249e21e4","after":"a9ab6aa230b18ae1a0652d5b775930220a783040","ref":"refs/heads/live","checkout_sha":"a9ab6aa230b18ae1a0652d5b775930220a783040","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"a9ab6aa230b18ae1a0652d5b775930220a783040","message":"Weddding landing page\n","title":"Weddding landing page","timestamp":"2022-06-21T17:44:42-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/a9ab6aa230b18ae1a0652d5b775930220a783040","author":{"name":"Edward Sandor","email":"ed@ewsandor.com"},"added":["www/wedding/index.html"],"modified":[],"removed":[]},{"id":"d8c55b3b9e88dc34a46a515c87a6c246006d5b91","message":"Publishing script to install Sandor Laboratories CA on Fedora Linux\n","title":"Publishing script to install Sandor Laboratories CA on Fedora Linux","timestamp":"2022-04-06T21:38:57-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/d8c55b3b9e88dc34a46a515c87a6c246006d5b91","author":{"name":"Ed Sandor","email":"ed@ewsandor.com"},"added":["ca_sandor_laboratories/install_ca_fedora.sh"],"modified":[],"removed":[]},{"id":"a5207711cf1a5a0bb857c92a83f7b392249e21e4","message":"Updated Intermediate CA CRL\n","title":"Updated Intermediate CA CRL","timestamp":"2021-10-06T15:12:41-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/a5207711cf1a5a0bb857c92a83f7b392249e21e4","author":{"name":"Ed Sandor","email":"ed@ewsandor.com"},"added":[],"modified":["ca_sandor_laboratories/crl/sandor_laboratories_intermediate_ca_edward_sandor.crl"],"removed":[]}],"total_commits_count":3,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} === ERROR: DIR `/var/www/sandorlaboratories.com` is not a repository === 23-06-2022 (22:42:03) {"object_kind":"push","event_name":"push","before":"a5207711cf1a5a0bb857c92a83f7b392249e21e4","after":"a9ab6aa230b18ae1a0652d5b775930220a783040","ref":"refs/heads/live","checkout_sha":"a9ab6aa230b18ae1a0652d5b775930220a783040","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"a9ab6aa230b18ae1a0652d5b775930220a783040","message":"Weddding landing page\n","title":"Weddding landing page","timestamp":"2022-06-21T17:44:42-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/a9ab6aa230b18ae1a0652d5b775930220a783040","author":{"name":"Edward Sandor","email":"ed@ewsandor.com"},"added":["www/wedding/index.html"],"modified":[],"removed":[]},{"id":"d8c55b3b9e88dc34a46a515c87a6c246006d5b91","message":"Publishing script to install Sandor Laboratories CA on Fedora Linux\n","title":"Publishing script to install Sandor Laboratories CA on Fedora Linux","timestamp":"2022-04-06T21:38:57-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/d8c55b3b9e88dc34a46a515c87a6c246006d5b91","author":{"name":"Ed Sandor","email":"ed@ewsandor.com"},"added":["ca_sandor_laboratories/install_ca_fedora.sh"],"modified":[],"removed":[]},{"id":"a5207711cf1a5a0bb857c92a83f7b392249e21e4","message":"Updated Intermediate CA CRL\n","title":"Updated Intermediate CA CRL","timestamp":"2021-10-06T15:12:41-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/a5207711cf1a5a0bb857c92a83f7b392249e21e4","author":{"name":"Ed Sandor","email":"ed@ewsandor.com"},"added":[],"modified":["ca_sandor_laboratories/crl/sandor_laboratories_intermediate_ca_edward_sandor.crl"],"removed":[]}],"total_commits_count":3,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. Already up to date. *** RESET TO HASH INITIATED *** HEAD is now at a9ab6aa Weddding landing page *** AUTO PULL COMPLETE *** 23-06-2022 (22:43:45) {"object_kind":"push","event_name":"push","before":"a9ab6aa230b18ae1a0652d5b775930220a783040","after":"518416a1b0460b14377bf9af00c4c556b1b68b6d","ref":"refs/heads/live","checkout_sha":"518416a1b0460b14377bf9af00c4c556b1b68b6d","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"518416a1b0460b14377bf9af00c4c556b1b68b6d","message":"Update README.md","title":"Update README.md","timestamp":"2022-06-23T22:43:44+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/518416a1b0460b14377bf9af00c4c556b1b68b6d","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["README.md"],"removed":[]}],"total_commits_count":1,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com a9ab6aa..518416a live -> origin/live Updating a9ab6aa..518416a Fast-forward README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) *** RESET TO HASH INITIATED *** HEAD is now at 518416a Update README.md *** AUTO PULL COMPLETE *** 24-06-2022 (01:24:05) === ERROR: No token detected === *** ACCESS DENIED *** 24-06-2022 (02:07:24) {"object_kind":"push","event_name":"push","before":"d8c55b3b9e88dc34a46a515c87a6c246006d5b91","after":"518416a1b0460b14377bf9af00c4c556b1b68b6d","ref":"refs/heads/live","checkout_sha":"518416a1b0460b14377bf9af00c4c556b1b68b6d","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"518416a1b0460b14377bf9af00c4c556b1b68b6d","message":"Update README.md","title":"Update README.md","timestamp":"2022-06-23T22:43:44+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/518416a1b0460b14377bf9af00c4c556b1b68b6d","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["README.md"],"removed":[]},{"id":"a9ab6aa230b18ae1a0652d5b775930220a783040","message":"Weddding landing page\n","title":"Weddding landing page","timestamp":"2022-06-21T17:44:42-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/a9ab6aa230b18ae1a0652d5b775930220a783040","author":{"name":"Edward Sandor","email":"ed@ewsandor.com"},"added":["www/wedding/index.html"],"modified":[],"removed":[]},{"id":"d8c55b3b9e88dc34a46a515c87a6c246006d5b91","message":"Publishing script to install Sandor Laboratories CA on Fedora Linux\n","title":"Publishing script to install Sandor Laboratories CA on Fedora Linux","timestamp":"2022-04-06T21:38:57-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/d8c55b3b9e88dc34a46a515c87a6c246006d5b91","author":{"name":"Ed Sandor","email":"ed@ewsandor.com"},"added":["ca_sandor_laboratories/install_ca_fedora.sh"],"modified":[],"removed":[]}],"total_commits_count":3,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. Already up to date. *** RESET TO HASH INITIATED *** HEAD is now at 518416a Update README.md *** AUTO PULL COMPLETE *** 24-06-2022 (02:34:33) {"object_kind":"push","event_name":"push","before":"d8c55b3b9e88dc34a46a515c87a6c246006d5b91","after":"518416a1b0460b14377bf9af00c4c556b1b68b6d","ref":"refs/heads/live","checkout_sha":"518416a1b0460b14377bf9af00c4c556b1b68b6d","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"518416a1b0460b14377bf9af00c4c556b1b68b6d","message":"Update README.md","title":"Update README.md","timestamp":"2022-06-23T22:43:44+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/518416a1b0460b14377bf9af00c4c556b1b68b6d","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["README.md"],"removed":[]},{"id":"a9ab6aa230b18ae1a0652d5b775930220a783040","message":"Weddding landing page\n","title":"Weddding landing page","timestamp":"2022-06-21T17:44:42-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/a9ab6aa230b18ae1a0652d5b775930220a783040","author":{"name":"Edward Sandor","email":"ed@ewsandor.com"},"added":["www/wedding/index.html"],"modified":[],"removed":[]},{"id":"d8c55b3b9e88dc34a46a515c87a6c246006d5b91","message":"Publishing script to install Sandor Laboratories CA on Fedora Linux\n","title":"Publishing script to install Sandor Laboratories CA on Fedora Linux","timestamp":"2022-04-06T21:38:57-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/d8c55b3b9e88dc34a46a515c87a6c246006d5b91","author":{"name":"Ed Sandor","email":"ed@ewsandor.com"},"added":["ca_sandor_laboratories/install_ca_fedora.sh"],"modified":[],"removed":[]}],"total_commits_count":3,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. Already up to date. *** RESET TO HASH INITIATED *** HEAD is now at 518416a Update README.md *** AUTO PULL COMPLETE *** 24-06-2022 (02:39:08) {"object_kind":"push","event_name":"push","before":"518416a1b0460b14377bf9af00c4c556b1b68b6d","after":"66b54b103d186b39f1a4820a1841c37593b00e8c","ref":"refs/heads/live","checkout_sha":"66b54b103d186b39f1a4820a1841c37593b00e8c","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"66b54b103d186b39f1a4820a1841c37593b00e8c","message":"testing git based deploy\n","title":"testing git based deploy","timestamp":"2022-06-23T20:38:30-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/66b54b103d186b39f1a4820a1841c37593b00e8c","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":["foo"],"modified":[],"removed":[]}],"total_commits_count":1,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 518416a..66b54b1 live -> origin/live Updating 518416a..66b54b1 Fast-forward foo | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 foo *** RESET TO HASH INITIATED *** HEAD is now at 66b54b1 testing git based deploy *** AUTO PULL COMPLETE *** 24-06-2022 (03:12:38) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 24-06-2022 (03:12:50) {"object_kind":"push","event_name":"push","before":"66b54b103d186b39f1a4820a1841c37593b00e8c","after":"00dba2c56e05fdab022afd29b7ce2fe55cd19d26","ref":"refs/heads/live","checkout_sha":"00dba2c56e05fdab022afd29b7ce2fe55cd19d26","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"37bcfd142134834289a574f12ba5fbef7ba95c3c","message":"symbolic link for static\n","title":"symbolic link for static","timestamp":"2022-06-23T21:10:25-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/37bcfd142134834289a574f12ba5fbef7ba95c3c","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/static"],"modified":[],"removed":[]},{"id":"00dba2c56e05fdab022afd29b7ce2fe55cd19d26","message":"Merge branch 'static-symbolic-link' into 'live'\n\nsymbolic link for static\n\nSee merge request edward/sandorlaboratories-com!1","title":"Merge branch 'static-symbolic-link' into 'live'","timestamp":"2022-06-24T03:12:49+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/00dba2c56e05fdab022afd29b7ce2fe55cd19d26","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/static"],"modified":[],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 24-06-2022 (03:12:50) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 66b54b1..00dba2c live -> origin/live Updating 66b54b1..00dba2c Fast-forward www/static | 1 + 1 file changed, 1 insertion(+) create mode 120000 www/static *** RESET TO HASH INITIATED *** HEAD is now at 00dba2c Merge branch 'static-symbolic-link' into 'live' *** AUTO PULL COMPLETE *** 24-06-2022 (04:18:00) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 24-06-2022 (04:18:08) {"object_kind":"push","event_name":"push","before":"00dba2c56e05fdab022afd29b7ce2fe55cd19d26","after":"077a2efcc0f7359e79353e01fa2c9ebf983bd1b6","ref":"refs/heads/live","checkout_sha":"077a2efcc0f7359e79353e01fa2c9ebf983bd1b6","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"ddf24a5ee6c4ed5ce2898b55a66a02e1f2a7aa0e","message":"Fix footer\n","title":"Fix footer","timestamp":"2022-06-23T21:46:52-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/ddf24a5ee6c4ed5ce2898b55a66a02e1f2a7aa0e","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/footer.php"],"modified":["www/index.php"],"removed":["foo","footer.php"]},{"id":"ec1000b57c99f1a782ebe8fc755b2fcb2e2f4f39","message":"Remove mastodon reference\n","title":"Remove mastodon reference","timestamp":"2022-06-23T22:07:00-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/ec1000b57c99f1a782ebe8fc755b2fcb2e2f4f39","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/index.php"],"removed":[]},{"id":"cfc65c60f1c267cddf8ede75dadd97d56c135478","message":"Reorder footer\n","title":"Reorder footer","timestamp":"2022-06-23T22:16:28-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/cfc65c60f1c267cddf8ede75dadd97d56c135478","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/footer.php"],"removed":[]},{"id":"077a2efcc0f7359e79353e01fa2c9ebf983bd1b6","message":"Merge branch 'staging' into 'live'\n\nStaging\n\nSee merge request edward/sandorlaboratories-com!2","title":"Merge branch 'staging' into 'live'","timestamp":"2022-06-24T04:18:07+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/077a2efcc0f7359e79353e01fa2c9ebf983bd1b6","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/footer.php"],"modified":["www/index.php"],"removed":["foo","footer.php"]}],"total_commits_count":4,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 24-06-2022 (04:18:08) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 00dba2c..077a2ef live -> origin/live * [new branch] staging -> origin/staging Updating 00dba2c..077a2ef Fast-forward foo | 0 footer.php | 7 ------- www/footer.php | 6 ++++++ www/index.php | 6 ++---- 4 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 foo delete mode 100755 footer.php create mode 100755 www/footer.php *** RESET TO HASH INITIATED *** HEAD is now at 077a2ef Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 24-06-2022 (04:31:18) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 24-06-2022 (04:31:26) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 24-06-2022 (04:31:26) {"object_kind":"push","event_name":"push","before":"077a2efcc0f7359e79353e01fa2c9ebf983bd1b6","after":"e6fccad84f80fb2f159dbe7072096a6efe1f0ae7","ref":"refs/heads/live","checkout_sha":"e6fccad84f80fb2f159dbe7072096a6efe1f0ae7","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"f86146af7615135816f68a9013cc848d3fc2e8c2","message":"Updating devaultenv archives\n","title":"Updating devaultenv archives","timestamp":"2022-06-23T22:23:14-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/f86146af7615135816f68a9013cc848d3fc2e8c2","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/defaultenv.tar.gz","www/defaultenv.zip"],"removed":[]},{"id":"813ccaf0697351c345e99628d68005e8099b3c3e","message":"Delete old TOS\n","title":"Delete old TOS","timestamp":"2022-06-23T22:23:35-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/813ccaf0697351c345e99628d68005e8099b3c3e","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":["www/tos.html"]},{"id":"08332d9839bf63e436dad76282a21529a893d0fb","message":"Formatting robots.txt\n","title":"Formatting robots.txt","timestamp":"2022-06-23T22:24:38-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/08332d9839bf63e436dad76282a21529a893d0fb","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/robots.txt"],"removed":[]},{"id":"073dddc1dffbb707ffe30cea9cc1efbfa9b88ef1","message":"Update readme\n","title":"Update readme","timestamp":"2022-06-23T22:29:58-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/073dddc1dffbb707ffe30cea9cc1efbfa9b88ef1","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["README.md"],"removed":[]},{"id":"483d54e7571454e85a4051789fd49e89d80d1e21","message":"Update CA CRL\n","title":"Update CA CRL","timestamp":"2022-06-23T22:30:03-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/483d54e7571454e85a4051789fd49e89d80d1e21","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["ca_sandor_laboratories/crl/sandor_laboratories_intermediate_ca_edward_sandor.crl"],"removed":[]},{"id":"e6fccad84f80fb2f159dbe7072096a6efe1f0ae7","message":"Merge branch 'staging' into 'live'\n\nStaging\n\nSee merge request edward/sandorlaboratories-com!3","title":"Merge branch 'staging' into 'live'","timestamp":"2022-06-24T04:31:26+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/e6fccad84f80fb2f159dbe7072096a6efe1f0ae7","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["README.md","ca_sandor_laboratories/crl/sandor_laboratories_intermediate_ca_edward_sandor.crl","www/defaultenv.tar.gz","www/defaultenv.zip","www/robots.txt"],"removed":["www/tos.html"]}],"total_commits_count":6,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 077a2ef..e6fccad live -> origin/live cfc65c6..483d54e staging -> origin/staging Updating 077a2ef..e6fccad Fast-forward README.md | 2 +- ..._laboratories_intermediate_ca_edward_sandor.crl | 57 ++++++++++++--------- www/defaultenv.tar.gz | Bin 22481 -> 6968 bytes www/defaultenv.zip | Bin 25745 -> 10545 bytes www/robots.txt | 8 +-- www/tos.html | 33 ------------ 6 files changed, 39 insertions(+), 61 deletions(-) mode change 100755 => 100644 www/defaultenv.tar.gz mode change 100755 => 100644 www/defaultenv.zip delete mode 100755 www/tos.html *** RESET TO HASH INITIATED *** HEAD is now at e6fccad Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 24-06-2022 (04:40:24) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 24-06-2022 (04:40:30) {"object_kind":"push","event_name":"push","before":"e6fccad84f80fb2f159dbe7072096a6efe1f0ae7","after":"a5d9e2392c64b0ecc6c1eec671f864c4cd408668","ref":"refs/heads/live","checkout_sha":"a5d9e2392c64b0ecc6c1eec671f864c4cd408668","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"4669cdba4ba164713ba8799237a841b3afe5ac1d","message":"Update README.md","title":"Update README.md","timestamp":"2022-06-24T04:34:11+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/4669cdba4ba164713ba8799237a841b3afe5ac1d","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["README.md"],"removed":[]},{"id":"685ecb14e7df2d5b75e43c5423cbc1f5d33d4c86","message":"License\n","title":"License","timestamp":"2022-06-23T22:39:13-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/685ecb14e7df2d5b75e43c5423cbc1f5d33d4c86","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":["LICENSE"],"modified":[],"removed":[]},{"id":"3fc21110782ed69075a87d567152791c6865f962","message":"Merge branch 'staging' of git.sandorlaboratories.com:edward/sandorlaboratories-com into staging\n","title":"Merge branch 'staging' of git.sandorlaboratories.com:edward/sandorlaboratories-com into staging","timestamp":"2022-06-23T22:39:57-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/3fc21110782ed69075a87d567152791c6865f962","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["README.md"],"removed":[]},{"id":"a5d9e2392c64b0ecc6c1eec671f864c4cd408668","message":"Merge branch 'staging' into 'live'\n\nStaging\n\nSee merge request edward/sandorlaboratories-com!4","title":"Merge branch 'staging' into 'live'","timestamp":"2022-06-24T04:40:30+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/a5d9e2392c64b0ecc6c1eec671f864c4cd408668","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["LICENSE"],"modified":["README.md"],"removed":[]}],"total_commits_count":4,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 24-06-2022 (04:40:30) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com e6fccad..a5d9e23 live -> origin/live 483d54e..3fc2111 staging -> origin/staging Updating e6fccad..a5d9e23 Fast-forward LICENSE | 3 +++ README.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 LICENSE *** RESET TO HASH INITIATED *** HEAD is now at a5d9e23 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 02-07-2022 (05:02:15) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 02-07-2022 (05:02:33) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 02-07-2022 (05:02:46) {"object_kind":"push","event_name":"push","before":"a5d9e2392c64b0ecc6c1eec671f864c4cd408668","after":"f21815392e2a772fff45f4163ac13554d3520329","ref":"refs/heads/live","checkout_sha":"f21815392e2a772fff45f4163ac13554d3520329","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"2bfa1025fc566cc23b48b7676e95c34c439a9d3b","message":"Pico CMS wedding site\n","title":"Pico CMS wedding site","timestamp":"2022-07-02T05:02:45+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/2bfa1025fc566cc23b48b7676e95c34c439a9d3b","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wedding/assets/us.jpg","www/wedding/config/config.yml","www/wedding/content/details.md","www/wedding/content/index.md","www/wedding/content/registry.md","www/wedding/themes/astral/assets/css/font-awesome.min.css","www/wedding/themes/astral/assets/css/ie8.css","www/wedding/themes/astral/assets/css/images/bg.jpg","www/wedding/themes/astral/assets/css/images/overlay.png","www/wedding/themes/astral/assets/css/images/stock_bg.jpg","www/wedding/themes/astral/assets/css/main.css","www/wedding/themes/astral/assets/css/noscript.css","www/wedding/themes/astral/assets/fonts/FontAwesome.otf","www/wedding/themes/astral/assets/fonts/fontawesome-webfont.eot","www/wedding/themes/astral/assets/fonts/fontawesome-webfont.svg","www/wedding/themes/astral/assets/fonts/fontawesome-webfont.ttf","www/wedding/themes/astral/assets/fonts/fontawesome-webfont.woff","www/wedding/themes/astral/assets/fonts/fontawesome-webfont.woff2","www/wedding/themes/astral/assets/js/ie/backgroundsize.min.htc","www/wedding/themes/astral/assets/js/ie/html5shiv.js","www/wedding/themes/astral/assets/js/ie/respond.min.js","www/wedding/themes/astral/assets/js/jquery.min.js","www/wedding/themes/astral/assets/js/main.js","www/wedding/themes/astral/assets/js/skel-viewport.min.js","www/wedding/themes/astral/assets/js/skel.min.js","www/wedding/themes/astral/assets/js/util.js","www/wedding/themes/astral/assets/sass/ie8.scss","www/wedding/themes/astral/assets/sass/libs/_functions.scss","www/wedding/themes/astral/assets/sass/libs/_mixins.scss","www/wedding/themes/astral/assets/sass/libs/_skel.scss","www/wedding/themes/astral/assets/sass/libs/_vars.scss","www/wedding/themes/astral/assets/sass/main.scss","www/wedding/themes/astral/assets/sass/noscript.scss","www/wedding/themes/astral/index.twig","www/wedding/themes/default/CHANGELOG.md","www/wedding/themes/default/LICENSE","www/wedding/themes/default/README.md","www/wedding/themes/default/composer.json","www/wedding/themes/default/css/droidsans.css","www/wedding/themes/default/css/fontello.css","www/wedding/themes/default/css/style.css","www/wedding/themes/default/font/DroidSans-Bold.eot","www/wedding/themes/default/font/DroidSans-Bold.svg","www/wedding/themes/default/font/DroidSans-Bold.ttf","www/wedding/themes/default/font/DroidSans-Bold.woff","www/wedding/themes/default/font/DroidSans-Bold.woff2","www/wedding/themes/default/font/DroidSans-Regular.eot","www/wedding/themes/default/font/DroidSans-Regular.svg","www/wedding/themes/default/font/DroidSans-Regular.ttf","www/wedding/themes/default/font/DroidSans-Regular.woff","www/wedding/themes/default/font/DroidSans-Regular.woff2","www/wedding/themes/default/font/DroidSansMono-Regular.eot","www/wedding/themes/default/font/DroidSansMono-Regular.svg","www/wedding/themes/default/font/DroidSansMono-Regular.ttf","www/wedding/themes/default/font/DroidSansMono-Regular.woff","www/wedding/themes/default/font/DroidSansMono-Regular.woff2","www/wedding/themes/default/font/LICENSE.txt","www/wedding/themes/default/icon/COPYRIGHT.txt","www/wedding/themes/default/icon/LICENSE.MIT.txt","www/wedding/themes/default/icon/LICENSE.OFL-1.1.txt","www/wedding/themes/default/icon/fontello.eot","www/wedding/themes/default/icon/fontello.svg","www/wedding/themes/default/icon/fontello.ttf","www/wedding/themes/default/icon/fontello.woff","www/wedding/themes/default/icon/fontello.woff2","www/wedding/themes/default/img/pico-white.svg","www/wedding/themes/default/img/pico.svg","www/wedding/themes/default/index.twig","www/wedding/themes/default/js/modernizr-3.3.1-custom.min.js","www/wedding/themes/default/js/pico.js","www/wedding/themes/default/js/utils.js","www/wedding/themes/default/pico-theme.yml"],"modified":[],"removed":[]},{"id":"f21815392e2a772fff45f4163ac13554d3520329","message":"Merge branch 'staging' into 'live'\n\nPico CMS wedding site\n\nSee merge request edward/sandorlaboratories-com!5","title":"Merge branch 'staging' into 'live'","timestamp":"2022-07-02T05:02:45+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/f21815392e2a772fff45f4163ac13554d3520329","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wedding/assets/us.jpg","www/wedding/config/config.yml","www/wedding/content/details.md","www/wedding/content/index.md","www/wedding/content/registry.md","www/wedding/themes/astral/assets/css/font-awesome.min.css","www/wedding/themes/astral/assets/css/ie8.css","www/wedding/themes/astral/assets/css/images/bg.jpg","www/wedding/themes/astral/assets/css/images/overlay.png","www/wedding/themes/astral/assets/css/images/stock_bg.jpg","www/wedding/themes/astral/assets/css/main.css","www/wedding/themes/astral/assets/css/noscript.css","www/wedding/themes/astral/assets/fonts/FontAwesome.otf","www/wedding/themes/astral/assets/fonts/fontawesome-webfont.eot","www/wedding/themes/astral/assets/fonts/fontawesome-webfont.svg","www/wedding/themes/astral/assets/fonts/fontawesome-webfont.ttf","www/wedding/themes/astral/assets/fonts/fontawesome-webfont.woff","www/wedding/themes/astral/assets/fonts/fontawesome-webfont.woff2","www/wedding/themes/astral/assets/js/ie/backgroundsize.min.htc","www/wedding/themes/astral/assets/js/ie/html5shiv.js","www/wedding/themes/astral/assets/js/ie/respond.min.js","www/wedding/themes/astral/assets/js/jquery.min.js","www/wedding/themes/astral/assets/js/main.js","www/wedding/themes/astral/assets/js/skel-viewport.min.js","www/wedding/themes/astral/assets/js/skel.min.js","www/wedding/themes/astral/assets/js/util.js","www/wedding/themes/astral/assets/sass/ie8.scss","www/wedding/themes/astral/assets/sass/libs/_functions.scss","www/wedding/themes/astral/assets/sass/libs/_mixins.scss","www/wedding/themes/astral/assets/sass/libs/_skel.scss","www/wedding/themes/astral/assets/sass/libs/_vars.scss","www/wedding/themes/astral/assets/sass/main.scss","www/wedding/themes/astral/assets/sass/noscript.scss","www/wedding/themes/astral/index.twig","www/wedding/themes/default/CHANGELOG.md","www/wedding/themes/default/LICENSE","www/wedding/themes/default/README.md","www/wedding/themes/default/composer.json","www/wedding/themes/default/css/droidsans.css","www/wedding/themes/default/css/fontello.css","www/wedding/themes/default/css/style.css","www/wedding/themes/default/font/DroidSans-Bold.eot","www/wedding/themes/default/font/DroidSans-Bold.svg","www/wedding/themes/default/font/DroidSans-Bold.ttf","www/wedding/themes/default/font/DroidSans-Bold.woff","www/wedding/themes/default/font/DroidSans-Bold.woff2","www/wedding/themes/default/font/DroidSans-Regular.eot","www/wedding/themes/default/font/DroidSans-Regular.svg","www/wedding/themes/default/font/DroidSans-Regular.ttf","www/wedding/themes/default/font/DroidSans-Regular.woff","www/wedding/themes/default/font/DroidSans-Regular.woff2","www/wedding/themes/default/font/DroidSansMono-Regular.eot","www/wedding/themes/default/font/DroidSansMono-Regular.svg","www/wedding/themes/default/font/DroidSansMono-Regular.ttf","www/wedding/themes/default/font/DroidSansMono-Regular.woff","www/wedding/themes/default/font/DroidSansMono-Regular.woff2","www/wedding/themes/default/font/LICENSE.txt","www/wedding/themes/default/icon/COPYRIGHT.txt","www/wedding/themes/default/icon/LICENSE.MIT.txt","www/wedding/themes/default/icon/LICENSE.OFL-1.1.txt","www/wedding/themes/default/icon/fontello.eot","www/wedding/themes/default/icon/fontello.svg","www/wedding/themes/default/icon/fontello.ttf","www/wedding/themes/default/icon/fontello.woff","www/wedding/themes/default/icon/fontello.woff2","www/wedding/themes/default/img/pico-white.svg","www/wedding/themes/default/img/pico.svg","www/wedding/themes/default/index.twig","www/wedding/themes/default/js/modernizr-3.3.1-custom.min.js","www/wedding/themes/default/js/pico.js","www/wedding/themes/default/js/utils.js","www/wedding/themes/default/pico-theme.yml"],"modified":[],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 02-07-2022 (05:02:46) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com a5d9e23..f218153 live -> origin/live 3fc2111..9c68b7c staging -> origin/staging Updating a5d9e23..f218153 Fast-forward www/wedding/assets/us.jpg | Bin 0 -> 3939166 bytes www/wedding/config/config.yml | 55 + www/wedding/content/details.md | 13 + www/wedding/content/index.md | 14 + www/wedding/content/registry.md | 13 + .../themes/astral/assets/css/font-awesome.min.css | 4 + www/wedding/themes/astral/assets/css/ie8.css | 29 + www/wedding/themes/astral/assets/css/images/bg.jpg | Bin 0 -> 5910254 bytes .../themes/astral/assets/css/images/overlay.png | Bin 0 -> 3535 bytes .../themes/astral/assets/css/images/stock_bg.jpg | Bin 0 -> 20035 bytes www/wedding/themes/astral/assets/css/main.css | 1584 +++++++++++++++ www/wedding/themes/astral/assets/css/noscript.css | 47 + .../themes/astral/assets/fonts/FontAwesome.otf | Bin 0 -> 124988 bytes .../astral/assets/fonts/fontawesome-webfont.eot | Bin 0 -> 76518 bytes .../astral/assets/fonts/fontawesome-webfont.svg | 685 +++++++ .../astral/assets/fonts/fontawesome-webfont.ttf | Bin 0 -> 152796 bytes .../astral/assets/fonts/fontawesome-webfont.woff | Bin 0 -> 90412 bytes .../astral/assets/fonts/fontawesome-webfont.woff2 | Bin 0 -> 71896 bytes .../astral/assets/js/ie/backgroundsize.min.htc | 7 + .../themes/astral/assets/js/ie/html5shiv.js | 8 + .../themes/astral/assets/js/ie/respond.min.js | 6 + www/wedding/themes/astral/assets/js/jquery.min.js | 5 + www/wedding/themes/astral/assets/js/main.js | 243 +++ .../themes/astral/assets/js/skel-viewport.min.js | 2 + www/wedding/themes/astral/assets/js/skel.min.js | 2 + www/wedding/themes/astral/assets/js/util.js | 587 ++++++ www/wedding/themes/astral/assets/sass/ie8.scss | 41 + .../themes/astral/assets/sass/libs/_functions.scss | 34 + .../themes/astral/assets/sass/libs/_mixins.scss | 56 + .../themes/astral/assets/sass/libs/_skel.scss | 585 ++++++ .../themes/astral/assets/sass/libs/_vars.scss | 20 + www/wedding/themes/astral/assets/sass/main.scss | 847 ++++++++ .../themes/astral/assets/sass/noscript.scss | 53 + www/wedding/themes/astral/index.twig | 153 ++ www/wedding/themes/default/CHANGELOG.md | 135 ++ www/wedding/themes/default/LICENSE | 21 + www/wedding/themes/default/README.md | 67 + www/wedding/themes/default/composer.json | 38 + www/wedding/themes/default/css/droidsans.css | 41 + www/wedding/themes/default/css/fontello.css | 61 + www/wedding/themes/default/css/style.css | 386 ++++ www/wedding/themes/default/font/DroidSans-Bold.eot | Bin 0 -> 20826 bytes www/wedding/themes/default/font/DroidSans-Bold.svg | 2021 ++++++++++++++++++++ www/wedding/themes/default/font/DroidSans-Bold.ttf | Bin 0 -> 39680 bytes .../themes/default/font/DroidSans-Bold.woff | Bin 0 -> 22928 bytes .../themes/default/font/DroidSans-Bold.woff2 | Bin 0 -> 18428 bytes .../themes/default/font/DroidSans-Regular.eot | Bin 0 -> 20756 bytes .../themes/default/font/DroidSans-Regular.svg | 2021 ++++++++++++++++++++ .../themes/default/font/DroidSans-Regular.ttf | Bin 0 -> 39900 bytes .../themes/default/font/DroidSans-Regular.woff | Bin 0 -> 22792 bytes .../themes/default/font/DroidSans-Regular.woff2 | Bin 0 -> 18396 bytes .../themes/default/font/DroidSansMono-Regular.eot | Bin 0 -> 31710 bytes .../themes/default/font/DroidSansMono-Regular.svg | 246 +++ .../themes/default/font/DroidSansMono-Regular.ttf | Bin 0 -> 31492 bytes .../themes/default/font/DroidSansMono-Regular.woff | Bin 0 -> 18968 bytes .../default/font/DroidSansMono-Regular.woff2 | Bin 0 -> 14636 bytes www/wedding/themes/default/font/LICENSE.txt | 189 ++ www/wedding/themes/default/icon/COPYRIGHT.txt | 23 + www/wedding/themes/default/icon/LICENSE.MIT.txt | 21 + .../themes/default/icon/LICENSE.OFL-1.1.txt | 94 + www/wedding/themes/default/icon/fontello.eot | Bin 0 -> 6376 bytes www/wedding/themes/default/icon/fontello.svg | 18 + www/wedding/themes/default/icon/fontello.ttf | Bin 0 -> 6208 bytes www/wedding/themes/default/icon/fontello.woff | Bin 0 -> 3752 bytes www/wedding/themes/default/icon/fontello.woff2 | Bin 0 -> 3060 bytes www/wedding/themes/default/img/pico-white.svg | 1 + www/wedding/themes/default/img/pico.svg | 1 + www/wedding/themes/default/index.twig | 85 + .../default/js/modernizr-3.3.1-custom.min.js | 3 + www/wedding/themes/default/js/pico.js | 74 + www/wedding/themes/default/js/utils.js | 134 ++ www/wedding/themes/default/pico-theme.yml | 14 + 72 files changed, 10787 insertions(+) create mode 100644 www/wedding/assets/us.jpg create mode 100644 www/wedding/config/config.yml create mode 100644 www/wedding/content/details.md create mode 100644 www/wedding/content/index.md create mode 100644 www/wedding/content/registry.md create mode 100644 www/wedding/themes/astral/assets/css/font-awesome.min.css create mode 100644 www/wedding/themes/astral/assets/css/ie8.css create mode 100644 www/wedding/themes/astral/assets/css/images/bg.jpg create mode 100644 www/wedding/themes/astral/assets/css/images/overlay.png create mode 100644 www/wedding/themes/astral/assets/css/images/stock_bg.jpg create mode 100644 www/wedding/themes/astral/assets/css/main.css create mode 100644 www/wedding/themes/astral/assets/css/noscript.css create mode 100644 www/wedding/themes/astral/assets/fonts/FontAwesome.otf create mode 100644 www/wedding/themes/astral/assets/fonts/fontawesome-webfont.eot create mode 100644 www/wedding/themes/astral/assets/fonts/fontawesome-webfont.svg create mode 100644 www/wedding/themes/astral/assets/fonts/fontawesome-webfont.ttf create mode 100644 www/wedding/themes/astral/assets/fonts/fontawesome-webfont.woff create mode 100644 www/wedding/themes/astral/assets/fonts/fontawesome-webfont.woff2 create mode 100644 www/wedding/themes/astral/assets/js/ie/backgroundsize.min.htc create mode 100644 www/wedding/themes/astral/assets/js/ie/html5shiv.js create mode 100644 www/wedding/themes/astral/assets/js/ie/respond.min.js create mode 100644 www/wedding/themes/astral/assets/js/jquery.min.js create mode 100644 www/wedding/themes/astral/assets/js/main.js create mode 100644 www/wedding/themes/astral/assets/js/skel-viewport.min.js create mode 100644 www/wedding/themes/astral/assets/js/skel.min.js create mode 100644 www/wedding/themes/astral/assets/js/util.js create mode 100644 www/wedding/themes/astral/assets/sass/ie8.scss create mode 100644 www/wedding/themes/astral/assets/sass/libs/_functions.scss create mode 100644 www/wedding/themes/astral/assets/sass/libs/_mixins.scss create mode 100644 www/wedding/themes/astral/assets/sass/libs/_skel.scss create mode 100644 www/wedding/themes/astral/assets/sass/libs/_vars.scss create mode 100644 www/wedding/themes/astral/assets/sass/main.scss create mode 100644 www/wedding/themes/astral/assets/sass/noscript.scss create mode 100644 www/wedding/themes/astral/index.twig create mode 100644 www/wedding/themes/default/CHANGELOG.md create mode 100644 www/wedding/themes/default/LICENSE create mode 100644 www/wedding/themes/default/README.md create mode 100644 www/wedding/themes/default/composer.json create mode 100644 www/wedding/themes/default/css/droidsans.css create mode 100644 www/wedding/themes/default/css/fontello.css create mode 100644 www/wedding/themes/default/css/style.css create mode 100644 www/wedding/themes/default/font/DroidSans-Bold.eot create mode 100644 www/wedding/themes/default/font/DroidSans-Bold.svg create mode 100644 www/wedding/themes/default/font/DroidSans-Bold.ttf create mode 100644 www/wedding/themes/default/font/DroidSans-Bold.woff create mode 100644 www/wedding/themes/default/font/DroidSans-Bold.woff2 create mode 100644 www/wedding/themes/default/font/DroidSans-Regular.eot create mode 100644 www/wedding/themes/default/font/DroidSans-Regular.svg create mode 100644 www/wedding/themes/default/font/DroidSans-Regular.ttf create mode 100644 www/wedding/themes/default/font/DroidSans-Regular.woff create mode 100644 www/wedding/themes/default/font/DroidSans-Regular.woff2 create mode 100644 www/wedding/themes/default/font/DroidSansMono-Regular.eot create mode 100644 www/wedding/themes/default/font/DroidSansMono-Regular.svg create mode 100644 www/wedding/themes/default/font/DroidSansMono-Regular.ttf create mode 100644 www/wedding/themes/default/font/DroidSansMono-Regular.woff create mode 100644 www/wedding/themes/default/font/DroidSansMono-Regular.woff2 create mode 100644 www/wedding/themes/default/font/LICENSE.txt create mode 100644 www/wedding/themes/default/icon/COPYRIGHT.txt create mode 100644 www/wedding/themes/default/icon/LICENSE.MIT.txt create mode 100644 www/wedding/themes/default/icon/LICENSE.OFL-1.1.txt create mode 100644 www/wedding/themes/default/icon/fontello.eot create mode 100644 www/wedding/themes/default/icon/fontello.svg create mode 100644 www/wedding/themes/default/icon/fontello.ttf create mode 100644 www/wedding/themes/default/icon/fontello.woff create mode 100644 www/wedding/themes/default/icon/fontello.woff2 create mode 100644 www/wedding/themes/default/img/pico-white.svg create mode 100644 www/wedding/themes/default/img/pico.svg create mode 100644 www/wedding/themes/default/index.twig create mode 100644 www/wedding/themes/default/js/modernizr-3.3.1-custom.min.js create mode 100644 www/wedding/themes/default/js/pico.js create mode 100644 www/wedding/themes/default/js/utils.js create mode 100644 www/wedding/themes/default/pico-theme.yml *** RESET TO HASH INITIATED *** HEAD is now at f218153 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 02-07-2022 (18:19:47) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 02-07-2022 (18:21:02) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 02-07-2022 (18:22:29) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 02-07-2022 (18:22:59) {"object_kind":"push","event_name":"push","before":"f21815392e2a772fff45f4163ac13554d3520329","after":"a1f4a7a075b896c5a67eb59b696f4f845898d1d0","ref":"refs/heads/live","checkout_sha":"a1f4a7a075b896c5a67eb59b696f4f845898d1d0","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"e35e4370cd19cf767327c79af8ce25c22de12363","message":"Formatting wedding theme\n","title":"Formatting wedding theme","timestamp":"2022-07-02T18:22:58+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/e35e4370cd19cf767327c79af8ce25c22de12363","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/config/config.yml","www/wedding/content/details.md","www/wedding/content/index.md","www/wedding/content/registry.md","www/wedding/themes/astral/index.twig"],"removed":[]},{"id":"a1f4a7a075b896c5a67eb59b696f4f845898d1d0","message":"Merge branch 'staging' into 'live'\n\nFormatting wedding theme\n\nSee merge request edward/sandorlaboratories-com!6","title":"Merge branch 'staging' into 'live'","timestamp":"2022-07-02T18:22:58+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/a1f4a7a075b896c5a67eb59b696f4f845898d1d0","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/config/config.yml","www/wedding/content/details.md","www/wedding/content/index.md","www/wedding/content/registry.md","www/wedding/themes/astral/index.twig"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 02-07-2022 (18:22:59) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com f218153..a1f4a7a live -> origin/live 9c68b7c..64bace7 staging -> origin/staging Updating f218153..a1f4a7a Fast-forward www/wedding/config/config.yml | 6 +++--- www/wedding/content/details.md | 1 + www/wedding/content/index.md | 5 ++--- www/wedding/content/registry.md | 1 + www/wedding/themes/astral/index.twig | 5 +++-- 5 files changed, 10 insertions(+), 8 deletions(-) *** RESET TO HASH INITIATED *** HEAD is now at a1f4a7a Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 02-07-2022 (18:38:56) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 02-07-2022 (18:39:01) {"object_kind":"push","event_name":"push","before":"a1f4a7a075b896c5a67eb59b696f4f845898d1d0","after":"2e9c1e76f7320c47df31736ca34237f969bb1871","ref":"refs/heads/live","checkout_sha":"2e9c1e76f7320c47df31736ca34237f969bb1871","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"51a80d8221707082a8d1e9faa7b248478e10639b","message":"Wedding footer\n","title":"Wedding footer","timestamp":"2022-07-02T18:39:00+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/51a80d8221707082a8d1e9faa7b248478e10639b","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/assets/css/main.css"],"removed":[]},{"id":"2e9c1e76f7320c47df31736ca34237f969bb1871","message":"Merge branch 'staging' into 'live'\n\nWedding footer\n\nSee merge request edward/sandorlaboratories-com!7","title":"Merge branch 'staging' into 'live'","timestamp":"2022-07-02T18:39:00+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/2e9c1e76f7320c47df31736ca34237f969bb1871","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/assets/css/main.css"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 02-07-2022 (18:39:01) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com a1f4a7a..2e9c1e7 live -> origin/live 64bace7..4f6e2d9 staging -> origin/staging Updating a1f4a7a..2e9c1e7 Fast-forward www/wedding/themes/astral/assets/css/main.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) *** RESET TO HASH INITIATED *** HEAD is now at 2e9c1e7 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 18-10-2022 (05:38:09) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 18-10-2022 (05:38:17) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 18-10-2022 (05:38:17) {"object_kind":"push","event_name":"push","before":"2e9c1e76f7320c47df31736ca34237f969bb1871","after":"e324f4fd86a942394b03055e51a28c3965a2c15e","ref":"refs/heads/live","checkout_sha":"e324f4fd86a942394b03055e51a28c3965a2c15e","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"2a0905fdb5dc3bbf9c67276c4280b48e696a800d","message":"rename\n","title":"rename","timestamp":"2022-07-02T13:09:36-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/2a0905fdb5dc3bbf9c67276c4280b48e696a800d","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wedding/content/details.md"],"modified":[],"removed":[]},{"id":"2cc230da8cc2c66736e7fa8db44a0a814f5988c2","message":"disable arrow\n","title":"disable arrow","timestamp":"2022-07-02T13:11:35-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/2cc230da8cc2c66736e7fa8db44a0a814f5988c2","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/index.twig"],"removed":[]},{"id":"264dbc966a1fd0e61413b7adcf6df0418e5dff2c","message":"profile image\n","title":"profile image","timestamp":"2022-07-02T13:12:57-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/264dbc966a1fd0e61413b7adcf6df0418e5dff2c","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/index.twig"],"removed":[]},{"id":"bfbfec817e2b82f76fadb8bad0f62c43d8f0a2ea","message":"profile\n","title":"profile","timestamp":"2022-07-02T13:16:44-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/bfbfec817e2b82f76fadb8bad0f62c43d8f0a2ea","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/index.twig"],"removed":[]},{"id":"3fb71153da615a803b3c67052cecacb767c38c57","message":"theme\n","title":"theme","timestamp":"2022-07-02T13:17:41-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/3fb71153da615a803b3c67052cecacb767c38c57","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/index.twig"],"removed":[]},{"id":"45aadebe7e80ebf8da5a25ab3d7e65c95cf2a8ae","message":"remove link\n","title":"remove link","timestamp":"2022-07-02T13:18:20-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/45aadebe7e80ebf8da5a25ab3d7e65c95cf2a8ae","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/index.twig"],"removed":[]},{"id":"e51682b8006b3b5c75af30c6f258869c6e72fa57","message":"Merge branch 'live' into 'staging'\n\n# Conflicts:\n# www/wedding/config/config.yml\n# www/wedding/content/details.md\n# www/wedding/content/index.md\n# www/wedding/content/registry.md\n# www/wedding/themes/astral/index.twig","title":"Merge branch 'live' into 'staging'","timestamp":"2022-07-02T18:21:01+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/e51682b8006b3b5c75af30c6f258869c6e72fa57","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":[]},{"id":"64bace79d90660f11e39e84b02f37e3dec62f9c9","message":"remove artifact\n","title":"remove artifact","timestamp":"2022-07-02T13:22:25-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/64bace79d90660f11e39e84b02f37e3dec62f9c9","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/index.twig"],"removed":[]},{"id":"1bcbeb243815e8fa2a2b6c9d3558cac31f367f48","message":"Footer\n","title":"Footer","timestamp":"2022-07-02T13:25:19-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/1bcbeb243815e8fa2a2b6c9d3558cac31f367f48","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/assets/css/main.css"],"removed":[]},{"id":"81381ea4c133828923b4f1b05fc481432950f35c","message":"footer\n","title":"footer","timestamp":"2022-07-02T13:25:50-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/81381ea4c133828923b4f1b05fc481432950f35c","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/assets/css/main.css"],"removed":[]},{"id":"8fca53527bc0830421b3c1e63643654d55610c1e","message":"footer\n","title":"footer","timestamp":"2022-07-02T13:26:33-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/8fca53527bc0830421b3c1e63643654d55610c1e","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/assets/css/main.css"],"removed":[]},{"id":"a576b36cef85d65d255f61097d20cfb1ce8d94c8","message":"footer\n","title":"footer","timestamp":"2022-07-02T13:29:06-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/a576b36cef85d65d255f61097d20cfb1ce8d94c8","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/assets/css/main.css"],"removed":[]},{"id":"4df3a04b7deb6605a7d0f72cef68bc880fe13d81","message":"footer\n","title":"footer","timestamp":"2022-07-02T13:33:33-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/4df3a04b7deb6605a7d0f72cef68bc880fe13d81","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/assets/css/main.css"],"removed":[]},{"id":"9d4381cc79e06f8926864b99d0c6ab699ad66c0d","message":"padding\n","title":"padding","timestamp":"2022-07-02T13:35:09-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/9d4381cc79e06f8926864b99d0c6ab699ad66c0d","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/assets/css/main.css"],"removed":[]},{"id":"4f6e2d9a781c8212476e248e14c058c458b1832c","message":"footer block\n","title":"footer block","timestamp":"2022-07-02T13:38:19-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/4f6e2d9a781c8212476e248e14c058c458b1832c","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/assets/css/main.css"],"removed":[]},{"id":"88e6a67b4d03510a81d50e76c4eb604a925650a4","message":"Filling details\n","title":"Filling details","timestamp":"2022-07-17T15:18:22-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/88e6a67b4d03510a81d50e76c4eb604a925650a4","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/content/details.md"],"removed":[]},{"id":"83473e260168a8d0bec4ad068164504f2be5b118","message":"Modifying 'order'\n","title":"Modifying 'order'","timestamp":"2022-07-17T15:22:21-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/83473e260168a8d0bec4ad068164504f2be5b118","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/content/details.md"],"removed":[]},{"id":"6edfe67680a898716a6d670825bb2b814059948d","message":"New CRL\n","title":"New CRL","timestamp":"2022-10-17T23:33:07-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/6edfe67680a898716a6d670825bb2b814059948d","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wedding/themes/astral/assets/css/main.css"],"removed":[]},{"id":"5c6bdc4d367fbc8ea1b2945df729ca520994caea","message":"New CRL\n","title":"New CRL","timestamp":"2022-10-17T23:34:30-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/5c6bdc4d367fbc8ea1b2945df729ca520994caea","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["ca_sandor_laboratories/crl/sandor_laboratories_intermediate_ca_edward_sandor.crl"],"removed":[]},{"id":"e324f4fd86a942394b03055e51a28c3965a2c15e","message":"Merge branch 'staging' into 'live'\n\nStaging\n\nSee merge request edward/sandorlaboratories-com!8","title":"Merge branch 'staging' into 'live'","timestamp":"2022-10-18T05:38:16+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/e324f4fd86a942394b03055e51a28c3965a2c15e","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["ca_sandor_laboratories/crl/sandor_laboratories_intermediate_ca_edward_sandor.crl","www/wedding/content/details.md","www/wedding/themes/astral/assets/css/main.css"],"removed":[]}],"total_commits_count":49,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 2e9c1e7..e324f4f live -> origin/live 4f6e2d9..5c6bdc4 staging -> origin/staging Updating 2e9c1e7..e324f4f Fast-forward ..._laboratories_intermediate_ca_edward_sandor.crl | 70 ++++++++++++---------- www/wedding/content/details.md | 11 +++- www/wedding/themes/astral/assets/css/main.css | 18 +----- 3 files changed, 47 insertions(+), 52 deletions(-) *** RESET TO HASH INITIATED *** HEAD is now at e324f4f Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 20-10-2022 (04:31:43) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 20-10-2022 (04:31:49) {"object_kind":"push","event_name":"push","before":"e324f4fd86a942394b03055e51a28c3965a2c15e","after":"55ceec28e2ac728a503c330a589a55d183811c52","ref":"refs/heads/live","checkout_sha":"55ceec28e2ac728a503c330a589a55d183811c52","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"0b1eb93232365b33e3320ef4fa37e0e53e2878da","message":"Update default environment\n","title":"Update default environment","timestamp":"2022-10-19T22:29:43-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/0b1eb93232365b33e3320ef4fa37e0e53e2878da","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/defaultenv.tar.gz","www/defaultenv.zip"],"removed":[]},{"id":"3ae7b09e19f0938a4e079421c43d657b26d8b349","message":"Create files directory\n","title":"Create files directory","timestamp":"2022-10-19T22:30:34-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/3ae7b09e19f0938a4e079421c43d657b26d8b349","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/files/defaultenv.tar.gz","www/files/defaultenv.zip"],"modified":[],"removed":[]},{"id":"55ceec28e2ac728a503c330a589a55d183811c52","message":"Merge branch 'staging' into 'live'\n\nStaging\n\nSee merge request edward/sandorlaboratories-com!9","title":"Merge branch 'staging' into 'live'","timestamp":"2022-10-20T04:31:48+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/55ceec28e2ac728a503c330a589a55d183811c52","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/files/defaultenv.tar.gz","www/files/defaultenv.zip"],"modified":[],"removed":["www/defaultenv.tar.gz","www/defaultenv.zip"]}],"total_commits_count":3,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 20-10-2022 (04:31:49) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com e324f4f..55ceec2 live -> origin/live 5c6bdc4..3ae7b09 staging -> origin/staging Updating e324f4f..55ceec2 Fast-forward www/defaultenv.tar.gz | Bin 6968 -> 0 bytes www/defaultenv.zip | Bin 10545 -> 0 bytes www/files/defaultenv.tar.gz | Bin 0 -> 7003 bytes www/files/defaultenv.zip | Bin 0 -> 10567 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 www/defaultenv.tar.gz delete mode 100644 www/defaultenv.zip create mode 100644 www/files/defaultenv.tar.gz create mode 100644 www/files/defaultenv.zip *** RESET TO HASH INITIATED *** HEAD is now at 55ceec2 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 28-01-2023 (16:18:21) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 28-01-2023 (16:18:33) {"object_kind":"push","event_name":"push","before":"55ceec28e2ac728a503c330a589a55d183811c52","after":"4eba8f6e7f728d8122093934e6af441a4d3752da","ref":"refs/heads/live","checkout_sha":"4eba8f6e7f728d8122093934e6af441a4d3752da","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"ddd036c99ffafe2f9fee0ebb5a39bf1f40f03ee8","message":"Back-up of the fallback version of our wedding website\n","title":"Back-up of the fallback version of our wedding website","timestamp":"2023-01-28T16:18:32+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/ddd036c99ffafe2f9fee0ebb5a39bf1f40f03ee8","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wedding/fallback/index.html","www/wedding/fallback/us.jpg"],"modified":[],"removed":[]},{"id":"4eba8f6e7f728d8122093934e6af441a4d3752da","message":"Merge branch 'staging' into 'live'\n\nBack-up of the fallback version of our wedding website\n\nSee merge request edward/sandorlaboratories-com!10","title":"Merge branch 'staging' into 'live'","timestamp":"2023-01-28T16:18:32+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/4eba8f6e7f728d8122093934e6af441a4d3752da","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wedding/fallback/index.html","www/wedding/fallback/us.jpg"],"modified":[],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 28-01-2023 (16:18:33) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 55ceec2..4eba8f6 live -> origin/live 3ae7b09..2953019 staging -> origin/staging Updating 55ceec2..4eba8f6 Fast-forward www/wedding/fallback/index.html | 38 ++++++++++++++++++++++++++++++++++++++ www/wedding/fallback/us.jpg | Bin 0 -> 1232895 bytes 2 files changed, 38 insertions(+) create mode 100644 www/wedding/fallback/index.html create mode 100644 www/wedding/fallback/us.jpg *** RESET TO HASH INITIATED *** HEAD is now at 4eba8f6 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 08-07-2023 (17:40:29) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 08-07-2023 (17:40:36) {"object_kind":"push","event_name":"push","before":"4eba8f6e7f728d8122093934e6af441a4d3752da","after":"01649627a724b77637ff74962cec306e1f324300","ref":"refs/heads/live","checkout_sha":"01649627a724b77637ff74962cec306e1f324300","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"3e2324505cd3c35fcdf6d2385d1aca087c0cb882","message":"Backing up fallback version of our wedding website.\n","title":"Backing up fallback version of our wedding website.","timestamp":"2023-01-28T09:14:17-07:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/3e2324505cd3c35fcdf6d2385d1aca087c0cb882","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wedding/fallback/Ed and Kaylee's Wedding.html","www/wedding/fallback/index.html","www/wedding/fallback/us.jpg"],"modified":[],"removed":[]},{"id":"29530192f06ba0557a321233c1e6e9e0a36aea27","message":"Remove incorrect file name\n","title":"Remove incorrect file name","timestamp":"2023-01-28T09:16:28-07:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/29530192f06ba0557a321233c1e6e9e0a36aea27","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":["www/wedding/fallback/Ed and Kaylee's Wedding.html"]},{"id":"f6f8ffe9c1ba198ed5cda69f9bc76df3ae7bd42f","message":"Updating CRL\n","title":"Updating CRL","timestamp":"2023-07-08T11:39:21-06:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/f6f8ffe9c1ba198ed5cda69f9bc76df3ae7bd42f","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["ca_sandor_laboratories/crl/sandor_laboratories_intermediate_ca_edward_sandor.crl"],"removed":[]},{"id":"01649627a724b77637ff74962cec306e1f324300","message":"Merge branch 'staging' into 'live'\n\nUpdating CRL\n\nSee merge request edward/sandorlaboratories-com!11","title":"Merge branch 'staging' into 'live'","timestamp":"2023-07-08T17:40:35+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/01649627a724b77637ff74962cec306e1f324300","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["ca_sandor_laboratories/crl/sandor_laboratories_intermediate_ca_edward_sandor.crl"],"removed":[]}],"total_commits_count":4,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 08-07-2023 (17:40:36) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 4eba8f6..0164962 live -> origin/live 2953019..f6f8ffe staging -> origin/staging Updating 4eba8f6..0164962 Fast-forward ..._laboratories_intermediate_ca_edward_sandor.crl | 87 +++++++++++++--------- 1 file changed, 53 insertions(+), 34 deletions(-) *** RESET TO HASH INITIATED *** HEAD is now at 0164962 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 05-07-2024 (23:46:12) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 05-07-2024 (23:46:23) {"object_kind":"push","event_name":"push","before":"01649627a724b77637ff74962cec306e1f324300","after":"7f30ca5975a57128af6dda40c31e0678abb0ab5a","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"7f30ca5975a57128af6dda40c31e0678abb0ab5a","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"ffbce173e70c7f46d3676cc2a7bdaac1ade0199f","message":"Hosting pingo results\n","title":"Hosting pingo results","timestamp":"2024-07-05T18:44:04-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/ffbce173e70c7f46d3676cc2a7bdaac1ade0199f","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/files/pingo/000_000_000_000_hilbert_16_color_depth_2_timeout_120_reserved_001_annotated.png","www/files/pingo/all_2022_08_28.tar.gz"],"modified":[],"removed":[]},{"id":"7f30ca5975a57128af6dda40c31e0678abb0ab5a","message":"Merge branch 'staging' into 'live'\n\nHosting pingo results\n\nSee merge request edward/sandorlaboratories-com!12","title":"Merge branch 'staging' into 'live'","timestamp":"2024-07-05T23:46:22+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/7f30ca5975a57128af6dda40c31e0678abb0ab5a","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/files/pingo/000_000_000_000_hilbert_16_color_depth_2_timeout_120_reserved_001_annotated.png","www/files/pingo/all_2022_08_28.tar.gz"],"modified":[],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 05-07-2024 (23:46:23) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 0164962..7f30ca5 live -> origin/live f6f8ffe..ffbce17 staging -> origin/staging Updating 0164962..7f30ca5 Fast-forward ...r_depth_2_timeout_120_reserved_001_annotated.png | Bin 0 -> 131531981 bytes www/files/pingo/all_2022_08_28.tar.gz | Bin 0 -> 399546159 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 www/files/pingo/000_000_000_000_hilbert_16_color_depth_2_timeout_120_reserved_001_annotated.png create mode 100644 www/files/pingo/all_2022_08_28.tar.gz *** RESET TO HASH INITIATED *** HEAD is now at 7f30ca5 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 06-07-2024 (00:05:06) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 06-07-2024 (00:05:17) {"object_kind":"push","event_name":"push","before":"7f30ca5975a57128af6dda40c31e0678abb0ab5a","after":"9f6c0ee4e91b16d39ced918092b97f4d6a74c214","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"9f6c0ee4e91b16d39ced918092b97f4d6a74c214","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"dc23fdcb76aaa5ec930cc617f4d848f4a8247acc","message":"Updating default config.\n","title":"Updating default config.","timestamp":"2024-07-05T18:55:30-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/dc23fdcb76aaa5ec930cc617f4d848f4a8247acc","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/files/defaultenv-main.tar.gz","www/files/defaultenv-main.zip"],"modified":[],"removed":["www/files/defaultenv.tar.gz","www/files/defaultenv.zip"]},{"id":"9f6c0ee4e91b16d39ced918092b97f4d6a74c214","message":"Merge branch 'staging' into 'live'\n\nUpdating default config.\n\nSee merge request edward/sandorlaboratories-com!13","title":"Merge branch 'staging' into 'live'","timestamp":"2024-07-06T00:05:16+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/9f6c0ee4e91b16d39ced918092b97f4d6a74c214","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/files/defaultenv-main.tar.gz","www/files/defaultenv-main.zip"],"modified":[],"removed":["www/files/defaultenv.tar.gz","www/files/defaultenv.zip"]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 06-07-2024 (00:05:17) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 7f30ca5..9f6c0ee live -> origin/live ffbce17..dc23fdc staging -> origin/staging Updating 7f30ca5..9f6c0ee Fast-forward www/files/defaultenv-main.tar.gz | Bin 0 -> 36500 bytes www/files/defaultenv-main.zip | Bin 0 -> 40682 bytes www/files/defaultenv.tar.gz | Bin 7003 -> 0 bytes www/files/defaultenv.zip | Bin 10567 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 www/files/defaultenv-main.tar.gz create mode 100644 www/files/defaultenv-main.zip delete mode 100644 www/files/defaultenv.tar.gz delete mode 100644 www/files/defaultenv.zip *** RESET TO HASH INITIATED *** HEAD is now at 9f6c0ee Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 02-08-2024 (22:54:25) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 02-08-2024 (22:54:47) {"object_kind":"push","event_name":"push","before":"9f6c0ee4e91b16d39ced918092b97f4d6a74c214","after":"ffe000be65998ceaeb590264f686bbaccf84c3a2","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"ffe000be65998ceaeb590264f686bbaccf84c3a2","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"c3252e417eba54550e45b858567a7b356f5f5557","message":"WJ9UNK Landing Page\n","title":"WJ9UNK Landing Page","timestamp":"2024-08-02T22:54:46+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/c3252e417eba54550e45b858567a7b356f5f5557","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wj9unk/index.html"],"modified":["www/files/defaultenv-main.tar.gz","www/files/defaultenv-main.zip"],"removed":[]},{"id":"ffe000be65998ceaeb590264f686bbaccf84c3a2","message":"Merge branch 'staging' into 'live'\n\nStaging\n\nSee merge request edward/sandorlaboratories-com!14","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-02T22:54:46+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/ffe000be65998ceaeb590264f686bbaccf84c3a2","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wj9unk/index.html"],"modified":["www/files/defaultenv-main.tar.gz","www/files/defaultenv-main.zip"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 02-08-2024 (22:54:47) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 9f6c0ee..ffe000b live -> origin/live dc23fdc..eb38f5d staging -> origin/staging Updating 9f6c0ee..ffe000b Fast-forward www/files/defaultenv-main.tar.gz | Bin 36500 -> 36638 bytes www/files/defaultenv-main.zip | Bin 40682 -> 40973 bytes www/wj9unk/index.html | 18 ++++++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 www/wj9unk/index.html *** RESET TO HASH INITIATED *** HEAD is now at ffe000b Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (00:01:04) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (00:03:28) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (00:03:45) {"object_kind":"push","event_name":"push","before":"ffe000be65998ceaeb590264f686bbaccf84c3a2","after":"491fb4d62570446c4e1924554ee9d4dee3a26a47","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"491fb4d62570446c4e1924554ee9d4dee3a26a47","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"94d032c64d20a59271dbd693c7be507cc112ef1e","message":"Jank'n up WJ9UNK\n","title":"Jank'n up WJ9UNK","timestamp":"2024-08-03T00:03:44+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/94d032c64d20a59271dbd693c7be507cc112ef1e","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wj9unk/favicon.ico","www/wj9unk/wj9unk_1000px.png","www/wj9unk/wj9unk_2000px.png","www/wj9unk/wj9unk_250px.png","www/wj9unk/wj9unk_500px.png"],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"491fb4d62570446c4e1924554ee9d4dee3a26a47","message":"Merge branch 'staging' into 'live'\n\nJank'n up WJ9UNK\n\nSee merge request edward/sandorlaboratories-com!15","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T00:03:44+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/491fb4d62570446c4e1924554ee9d4dee3a26a47","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wj9unk/favicon.ico","www/wj9unk/wj9unk_1000px.png","www/wj9unk/wj9unk_2000px.png","www/wj9unk/wj9unk_250px.png","www/wj9unk/wj9unk_500px.png"],"modified":["www/wj9unk/index.html"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (00:03:45) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com ffe000b..491fb4d live -> origin/live eb38f5d..ed4cdb0 staging -> origin/staging Updating ffe000b..491fb4d Fast-forward www/wj9unk/favicon.ico | Bin 0 -> 228542 bytes www/wj9unk/index.html | 5 ++++- www/wj9unk/wj9unk_1000px.png | Bin 0 -> 212932 bytes www/wj9unk/wj9unk_2000px.png | Bin 0 -> 454589 bytes www/wj9unk/wj9unk_250px.png | Bin 0 -> 45915 bytes www/wj9unk/wj9unk_500px.png | Bin 0 -> 101441 bytes 6 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 www/wj9unk/favicon.ico create mode 100644 www/wj9unk/wj9unk_1000px.png create mode 100644 www/wj9unk/wj9unk_2000px.png create mode 100644 www/wj9unk/wj9unk_250px.png create mode 100644 www/wj9unk/wj9unk_500px.png *** RESET TO HASH INITIATED *** HEAD is now at 491fb4d Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (01:05:10) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (01:05:43) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (01:05:57) {"object_kind":"push","event_name":"push","before":"491fb4d62570446c4e1924554ee9d4dee3a26a47","after":"f79c6070e08ed0ce8ea6bb3e4f423577050fa3c7","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"f79c6070e08ed0ce8ea6bb3e4f423577050fa3c7","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"b28eec2e19fd26fc045d52397c3488bec9c2cb73","message":"WJ9UNK GIFs\n","title":"WJ9UNK GIFs","timestamp":"2024-08-03T01:05:52+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/b28eec2e19fd26fc045d52397c3488bec9c2cb73","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wj9unk/gif/000.png","www/wj9unk/gif/030.png","www/wj9unk/gif/060.png","www/wj9unk/gif/120.png","www/wj9unk/gif/150.png","www/wj9unk/gif/180.png","www/wj9unk/gif/210.png","www/wj9unk/gif/240.png","www/wj9unk/gif/300.png","www/wj9unk/gif/330.png","www/wj9unk/gif/notused/045.png","www/wj9unk/gif/notused/090.png","www/wj9unk/gif/notused/135.png","www/wj9unk/gif/notused/225.png","www/wj9unk/gif/notused/270.png","www/wj9unk/gif/notused/315.png","www/wj9unk/gif/wj9unk.gif","www/wj9unk/gif/wj9unk_lowres.gif","www/wj9unk/wj9unk.gif","www/wj9unk/wj9unk_lowres.gif"],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"f79c6070e08ed0ce8ea6bb3e4f423577050fa3c7","message":"Merge branch 'staging' into 'live'\n\nWJ9UNK GIFs\n\nSee merge request edward/sandorlaboratories-com!16","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T01:05:52+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/f79c6070e08ed0ce8ea6bb3e4f423577050fa3c7","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wj9unk/gif/000.png","www/wj9unk/gif/030.png","www/wj9unk/gif/060.png","www/wj9unk/gif/120.png","www/wj9unk/gif/150.png","www/wj9unk/gif/180.png","www/wj9unk/gif/210.png","www/wj9unk/gif/240.png","www/wj9unk/gif/300.png","www/wj9unk/gif/330.png","www/wj9unk/gif/notused/045.png","www/wj9unk/gif/notused/090.png","www/wj9unk/gif/notused/135.png","www/wj9unk/gif/notused/225.png","www/wj9unk/gif/notused/270.png","www/wj9unk/gif/notused/315.png","www/wj9unk/gif/wj9unk.gif","www/wj9unk/gif/wj9unk_lowres.gif","www/wj9unk/wj9unk.gif","www/wj9unk/wj9unk_lowres.gif"],"modified":["www/wj9unk/index.html"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (01:05:58) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 491fb4d..f79c607 live -> origin/live ed4cdb0..cfc31d2 staging -> origin/staging Updating 491fb4d..f79c607 Fast-forward www/wj9unk/gif/000.png | Bin 0 -> 454589 bytes www/wj9unk/gif/030.png | Bin 0 -> 774754 bytes www/wj9unk/gif/060.png | Bin 0 -> 615287 bytes www/wj9unk/gif/120.png | Bin 0 -> 639322 bytes www/wj9unk/gif/150.png | Bin 0 -> 782651 bytes www/wj9unk/gif/180.png | Bin 0 -> 738429 bytes www/wj9unk/gif/210.png | Bin 0 -> 761767 bytes www/wj9unk/gif/240.png | Bin 0 -> 598958 bytes www/wj9unk/gif/300.png | Bin 0 -> 625832 bytes www/wj9unk/gif/330.png | Bin 0 -> 776729 bytes www/wj9unk/gif/notused/045.png | Bin 0 -> 728176 bytes www/wj9unk/gif/notused/090.png | Bin 0 -> 24107 bytes www/wj9unk/gif/notused/135.png | Bin 0 -> 739449 bytes www/wj9unk/gif/notused/225.png | Bin 0 -> 711338 bytes www/wj9unk/gif/notused/270.png | Bin 0 -> 24107 bytes www/wj9unk/gif/notused/315.png | Bin 0 -> 730815 bytes www/wj9unk/gif/wj9unk.gif | Bin 0 -> 2247467 bytes www/wj9unk/gif/wj9unk_lowres.gif | Bin 0 -> 31769 bytes www/wj9unk/index.html | 32 +++++++++++++++++++++++++++++--- www/wj9unk/wj9unk.gif | Bin 0 -> 2247467 bytes www/wj9unk/wj9unk_lowres.gif | Bin 0 -> 31769 bytes 21 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 www/wj9unk/gif/000.png create mode 100644 www/wj9unk/gif/030.png create mode 100644 www/wj9unk/gif/060.png create mode 100644 www/wj9unk/gif/120.png create mode 100644 www/wj9unk/gif/150.png create mode 100644 www/wj9unk/gif/180.png create mode 100644 www/wj9unk/gif/210.png create mode 100644 www/wj9unk/gif/240.png create mode 100644 www/wj9unk/gif/300.png create mode 100644 www/wj9unk/gif/330.png create mode 100644 www/wj9unk/gif/notused/045.png create mode 100644 www/wj9unk/gif/notused/090.png create mode 100644 www/wj9unk/gif/notused/135.png create mode 100644 www/wj9unk/gif/notused/225.png create mode 100644 www/wj9unk/gif/notused/270.png create mode 100644 www/wj9unk/gif/notused/315.png create mode 100644 www/wj9unk/gif/wj9unk.gif create mode 100644 www/wj9unk/gif/wj9unk_lowres.gif create mode 100644 www/wj9unk/wj9unk.gif create mode 100644 www/wj9unk/wj9unk_lowres.gif *** RESET TO HASH INITIATED *** HEAD is now at f79c607 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (01:31:06) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (01:31:22) {"object_kind":"push","event_name":"push","before":"f79c6070e08ed0ce8ea6bb3e4f423577050fa3c7","after":"6d9fbce9f184d92048d18e404c603332fab68631","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"6d9fbce9f184d92048d18e404c603332fab68631","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"ebe5c398b73a117c310a4ca956dc8b951ae50fb6","message":"Cleanup\n","title":"Cleanup","timestamp":"2024-08-03T01:31:20+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/ebe5c398b73a117c310a4ca956dc8b951ae50fb6","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":["www/wj9unk/gif/000.png","www/wj9unk/gif/030.png","www/wj9unk/gif/060.png","www/wj9unk/gif/120.png","www/wj9unk/gif/150.png","www/wj9unk/gif/180.png","www/wj9unk/gif/210.png","www/wj9unk/gif/240.png","www/wj9unk/gif/300.png","www/wj9unk/gif/330.png","www/wj9unk/gif/notused/045.png","www/wj9unk/gif/notused/090.png","www/wj9unk/gif/notused/135.png","www/wj9unk/gif/notused/225.png","www/wj9unk/gif/notused/270.png","www/wj9unk/gif/notused/315.png","www/wj9unk/gif/wj9unk.gif","www/wj9unk/gif/wj9unk_lowres.gif"]},{"id":"6d9fbce9f184d92048d18e404c603332fab68631","message":"Merge branch 'staging' into 'live'\n\nCleanup\n\nSee merge request edward/sandorlaboratories-com!17","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T01:31:21+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/6d9fbce9f184d92048d18e404c603332fab68631","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":["www/wj9unk/gif/000.png","www/wj9unk/gif/030.png","www/wj9unk/gif/060.png","www/wj9unk/gif/120.png","www/wj9unk/gif/150.png","www/wj9unk/gif/180.png","www/wj9unk/gif/210.png","www/wj9unk/gif/240.png","www/wj9unk/gif/300.png","www/wj9unk/gif/330.png","www/wj9unk/gif/notused/045.png","www/wj9unk/gif/notused/090.png","www/wj9unk/gif/notused/135.png","www/wj9unk/gif/notused/225.png","www/wj9unk/gif/notused/270.png","www/wj9unk/gif/notused/315.png","www/wj9unk/gif/wj9unk.gif","www/wj9unk/gif/wj9unk_lowres.gif"]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (01:31:22) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com f79c607..6d9fbce live -> origin/live cfc31d2..71327e0 staging -> origin/staging Updating f79c607..6d9fbce Fast-forward www/wj9unk/gif/000.png | Bin 454589 -> 0 bytes www/wj9unk/gif/030.png | Bin 774754 -> 0 bytes www/wj9unk/gif/060.png | Bin 615287 -> 0 bytes www/wj9unk/gif/120.png | Bin 639322 -> 0 bytes www/wj9unk/gif/150.png | Bin 782651 -> 0 bytes www/wj9unk/gif/180.png | Bin 738429 -> 0 bytes www/wj9unk/gif/210.png | Bin 761767 -> 0 bytes www/wj9unk/gif/240.png | Bin 598958 -> 0 bytes www/wj9unk/gif/300.png | Bin 625832 -> 0 bytes www/wj9unk/gif/330.png | Bin 776729 -> 0 bytes www/wj9unk/gif/notused/045.png | Bin 728176 -> 0 bytes www/wj9unk/gif/notused/090.png | Bin 24107 -> 0 bytes www/wj9unk/gif/notused/135.png | Bin 739449 -> 0 bytes www/wj9unk/gif/notused/225.png | Bin 711338 -> 0 bytes www/wj9unk/gif/notused/270.png | Bin 24107 -> 0 bytes www/wj9unk/gif/notused/315.png | Bin 730815 -> 0 bytes www/wj9unk/gif/wj9unk.gif | Bin 2247467 -> 0 bytes www/wj9unk/gif/wj9unk_lowres.gif | Bin 31769 -> 0 bytes 18 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 www/wj9unk/gif/000.png delete mode 100644 www/wj9unk/gif/030.png delete mode 100644 www/wj9unk/gif/060.png delete mode 100644 www/wj9unk/gif/120.png delete mode 100644 www/wj9unk/gif/150.png delete mode 100644 www/wj9unk/gif/180.png delete mode 100644 www/wj9unk/gif/210.png delete mode 100644 www/wj9unk/gif/240.png delete mode 100644 www/wj9unk/gif/300.png delete mode 100644 www/wj9unk/gif/330.png delete mode 100644 www/wj9unk/gif/notused/045.png delete mode 100644 www/wj9unk/gif/notused/090.png delete mode 100644 www/wj9unk/gif/notused/135.png delete mode 100644 www/wj9unk/gif/notused/225.png delete mode 100644 www/wj9unk/gif/notused/270.png delete mode 100644 www/wj9unk/gif/notused/315.png delete mode 100644 www/wj9unk/gif/wj9unk.gif delete mode 100644 www/wj9unk/gif/wj9unk_lowres.gif *** RESET TO HASH INITIATED *** HEAD is now at 6d9fbce Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (01:42:19) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (01:42:24) {"object_kind":"push","event_name":"push","before":"6d9fbce9f184d92048d18e404c603332fab68631","after":"d10c684314d42f40c5c8cf272dda75b702012e0d","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"d10c684314d42f40c5c8cf272dda75b702012e0d","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"b92ddeb0358a40648e5d10c14d3f6b6c477a5603","message":"Radio Symbol\n","title":"Radio Symbol","timestamp":"2024-08-03T01:42:23+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/b92ddeb0358a40648e5d10c14d3f6b6c477a5603","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wj9unk/international_amateur_radio_symbol.png","www/wj9unk/wj9unk_2000px_whitebg.png"],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"d10c684314d42f40c5c8cf272dda75b702012e0d","message":"Merge branch 'staging' into 'live'\n\nRadio Symbol\n\nSee merge request edward/sandorlaboratories-com!18","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T01:42:23+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/d10c684314d42f40c5c8cf272dda75b702012e0d","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":["www/wj9unk/international_amateur_radio_symbol.png","www/wj9unk/wj9unk_2000px_whitebg.png"],"modified":["www/wj9unk/index.html"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (01:42:24) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 6d9fbce..d10c684 live -> origin/live 71327e0..b732123 staging -> origin/staging Updating 6d9fbce..d10c684 Fast-forward www/wj9unk/index.html | 5 +++-- www/wj9unk/international_amateur_radio_symbol.png | Bin 0 -> 57092 bytes www/wj9unk/wj9unk_2000px_whitebg.png | Bin 0 -> 441254 bytes 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 www/wj9unk/international_amateur_radio_symbol.png create mode 100644 www/wj9unk/wj9unk_2000px_whitebg.png *** RESET TO HASH INITIATED *** HEAD is now at d10c684 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (01:54:12) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (01:54:16) {"object_kind":"push","event_name":"push","before":"d10c684314d42f40c5c8cf272dda75b702012e0d","after":"a6050c0c0393ffb6d9bb5aeb35b250ee4a6e6b1b","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"a6050c0c0393ffb6d9bb5aeb35b250ee4a6e6b1b","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"03784f508f56e58fa6d7b4ac71fd6dbc26490f5b","message":"Fix mastodon link\n","title":"Fix mastodon link","timestamp":"2024-08-03T01:54:16+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/03784f508f56e58fa6d7b4ac71fd6dbc26490f5b","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"a6050c0c0393ffb6d9bb5aeb35b250ee4a6e6b1b","message":"Merge branch 'staging' into 'live'\n\nFix mastodon link\n\nSee merge request edward/sandorlaboratories-com!19","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T01:54:16+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/a6050c0c0393ffb6d9bb5aeb35b250ee4a6e6b1b","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (01:54:17) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com d10c684..a6050c0 live -> origin/live b732123..7cd897a staging -> origin/staging Updating d10c684..a6050c0 Fast-forward www/wj9unk/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) *** RESET TO HASH INITIATED *** HEAD is now at a6050c0 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (02:00:30) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (02:00:38) {"object_kind":"push","event_name":"push","before":"a6050c0c0393ffb6d9bb5aeb35b250ee4a6e6b1b","after":"d6702e7e9aca0280593c67c092c954bb7184b563","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"d6702e7e9aca0280593c67c092c954bb7184b563","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"2fa4de5ed83d10acd9166ca1309f597b19b0b8c3","message":"WJ9UNK Cleanup\n","title":"WJ9UNK Cleanup","timestamp":"2024-08-03T02:00:36+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/2fa4de5ed83d10acd9166ca1309f597b19b0b8c3","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"d6702e7e9aca0280593c67c092c954bb7184b563","message":"Merge branch 'staging' into 'live'\n\nWJ9UNK Cleanup\n\nSee merge request edward/sandorlaboratories-com!20","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T02:00:36+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/d6702e7e9aca0280593c67c092c954bb7184b563","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (02:00:38) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com a6050c0..d6702e7 live -> origin/live 7cd897a..2f179a0 staging -> origin/staging Updating a6050c0..d6702e7 Fast-forward www/wj9unk/index.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) *** RESET TO HASH INITIATED *** HEAD is now at d6702e7 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (02:07:50) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (02:07:54) {"object_kind":"push","event_name":"push","before":"d6702e7e9aca0280593c67c092c954bb7184b563","after":"309a1d13639754e8c0c7ac0b68317345ab3077b8","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"309a1d13639754e8c0c7ac0b68317345ab3077b8","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"6a34b59baebfbf7f0f2e84d616c51edb0ecd4c43","message":"QRZ Widget\n","title":"QRZ Widget","timestamp":"2024-08-03T02:07:53+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/6a34b59baebfbf7f0f2e84d616c51edb0ecd4c43","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"309a1d13639754e8c0c7ac0b68317345ab3077b8","message":"Merge branch 'staging' into 'live'\n\nQRZ Widget\n\nSee merge request edward/sandorlaboratories-com!21","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T02:07:53+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/309a1d13639754e8c0c7ac0b68317345ab3077b8","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (02:07:54) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com d6702e7..309a1d1 live -> origin/live 2f179a0..4f9de07 staging -> origin/staging Updating d6702e7..309a1d1 Fast-forward www/wj9unk/index.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) *** RESET TO HASH INITIATED *** HEAD is now at 309a1d1 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (02:27:31) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (02:27:34) {"object_kind":"push","event_name":"push","before":"309a1d13639754e8c0c7ac0b68317345ab3077b8","after":"ab6b8bd906a83e76479bcdea55dab6d161ced0c1","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"ab6b8bd906a83e76479bcdea55dab6d161ced0c1","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"9a29c11826217563038194f12763a1d463519eed","message":"Update WJ9UNK Bio\n","title":"Update WJ9UNK Bio","timestamp":"2024-08-03T02:27:33+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/9a29c11826217563038194f12763a1d463519eed","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"ab6b8bd906a83e76479bcdea55dab6d161ced0c1","message":"Merge branch 'staging' into 'live'\n\nUpdate WJ9UNK Bio\n\nSee merge request edward/sandorlaboratories-com!22","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T02:27:33+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/ab6b8bd906a83e76479bcdea55dab6d161ced0c1","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (02:27:34) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 309a1d1..ab6b8bd live -> origin/live 4f9de07..615dc51 staging -> origin/staging Updating 309a1d1..ab6b8bd Fast-forward www/wj9unk/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) *** RESET TO HASH INITIATED *** HEAD is now at ab6b8bd Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (02:37:50) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (02:37:54) {"object_kind":"push","event_name":"push","before":"ab6b8bd906a83e76479bcdea55dab6d161ced0c1","after":"f2c96a757c4f702a8a7895645199fcac5da0eca5","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"f2c96a757c4f702a8a7895645199fcac5da0eca5","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"ef38163d53c7ba42482984f6770db44cd594122e","message":"WJ9UNK Mastodon Link\n","title":"WJ9UNK Mastodon Link","timestamp":"2024-08-03T02:37:53+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/ef38163d53c7ba42482984f6770db44cd594122e","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"f2c96a757c4f702a8a7895645199fcac5da0eca5","message":"Merge branch 'staging' into 'live'\n\nWJ9UNK Mastodon Link\n\nSee merge request edward/sandorlaboratories-com!23","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T02:37:54+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/f2c96a757c4f702a8a7895645199fcac5da0eca5","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (02:37:54) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com ab6b8bd..f2c96a7 live -> origin/live 615dc51..924d014 staging -> origin/staging Updating ab6b8bd..f2c96a7 Fast-forward www/wj9unk/index.html | 1 + 1 file changed, 1 insertion(+) *** RESET TO HASH INITIATED *** HEAD is now at f2c96a7 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (03:03:34) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (03:14:15) {"object_kind":"push","event_name":"push","before":"f2c96a757c4f702a8a7895645199fcac5da0eca5","after":"49f8d39026a29141169dd45000cbe89c87354d0c","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"49f8d39026a29141169dd45000cbe89c87354d0c","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"4f7da897dcaaf7c742ca24ed79093acd592248c6","message":"WJ9UNK ISS\n","title":"WJ9UNK ISS","timestamp":"2024-08-03T03:14:14+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/4f7da897dcaaf7c742ca24ed79093acd592248c6","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"49f8d39026a29141169dd45000cbe89c87354d0c","message":"Merge branch 'staging' into 'live'\n\nWJ9UNK ISS\n\nSee merge request edward/sandorlaboratories-com!24","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T03:14:14+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/49f8d39026a29141169dd45000cbe89c87354d0c","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (03:14:15) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com f2c96a7..49f8d39 live -> origin/live 924d014..8e24201 staging -> origin/staging Updating f2c96a7..49f8d39 Fast-forward www/wj9unk/index.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) *** RESET TO HASH INITIATED *** HEAD is now at 49f8d39 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (03:57:38) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (03:57:43) {"object_kind":"push","event_name":"push","before":"49f8d39026a29141169dd45000cbe89c87354d0c","after":"af2aca0b294e4c3f10def9c90cd51ea4088b5b4c","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"af2aca0b294e4c3f10def9c90cd51ea4088b5b4c","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"b0359ba42c2bf3484cbdb5ea9b0b71c41165f776","message":"W9JWC Shoutout\n","title":"W9JWC Shoutout","timestamp":"2024-08-03T03:57:42+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/b0359ba42c2bf3484cbdb5ea9b0b71c41165f776","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"af2aca0b294e4c3f10def9c90cd51ea4088b5b4c","message":"Merge branch 'staging' into 'live'\n\nW9JWC Shoutout\n\nSee merge request edward/sandorlaboratories-com!25","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T03:57:42+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/af2aca0b294e4c3f10def9c90cd51ea4088b5b4c","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (03:57:43) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 49f8d39..af2aca0 live -> origin/live 8e24201..8c9738d staging -> origin/staging Updating 49f8d39..af2aca0 Fast-forward www/wj9unk/index.html | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) *** RESET TO HASH INITIATED *** HEAD is now at af2aca0 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (04:06:49) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (04:06:54) {"object_kind":"push","event_name":"push","before":"af2aca0b294e4c3f10def9c90cd51ea4088b5b4c","after":"8a755cacfc78776cd17e9d53f41517dcaf084f51","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"8a755cacfc78776cd17e9d53f41517dcaf084f51","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"b928c603152b5677860a93930c41fd7ea84b50f1","message":"WJ9UNK Center H1\n","title":"WJ9UNK Center H1","timestamp":"2024-08-03T04:06:53+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/b928c603152b5677860a93930c41fd7ea84b50f1","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"8a755cacfc78776cd17e9d53f41517dcaf084f51","message":"Merge branch 'staging' into 'live'\n\nWJ9UNK Center H1\n\nSee merge request edward/sandorlaboratories-com!26","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T04:06:53+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/8a755cacfc78776cd17e9d53f41517dcaf084f51","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (04:06:54) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com af2aca0..8a755ca live -> origin/live 8c9738d..0f18ab4 staging -> origin/staging Updating af2aca0..8a755ca Fast-forward www/wj9unk/index.html | 1 + 1 file changed, 1 insertion(+) *** RESET TO HASH INITIATED *** HEAD is now at 8a755ca Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 03-08-2024 (04:31:25) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 03-08-2024 (04:31:31) {"object_kind":"push","event_name":"push","before":"8a755cacfc78776cd17e9d53f41517dcaf084f51","after":"77c94fc7da8bcb978fd5b62bff4e30e479fcf64a","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"77c94fc7da8bcb978fd5b62bff4e30e479fcf64a","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"612f69f0eb0d6a236dcc2389c8b7d41cad652d61","message":"WJ9UNK Quote\n","title":"WJ9UNK Quote","timestamp":"2024-08-03T04:31:30+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/612f69f0eb0d6a236dcc2389c8b7d41cad652d61","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"77c94fc7da8bcb978fd5b62bff4e30e479fcf64a","message":"Merge branch 'staging' into 'live'\n\nWJ9UNK Quote\n\nSee merge request edward/sandorlaboratories-com!27","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-03T04:31:30+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/77c94fc7da8bcb978fd5b62bff4e30e479fcf64a","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 03-08-2024 (04:31:31) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 8a755ca..77c94fc live -> origin/live 0f18ab4..5d3ba59 staging -> origin/staging Updating 8a755ca..77c94fc Fast-forward www/wj9unk/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) *** RESET TO HASH INITIATED *** HEAD is now at 77c94fc Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 15-08-2024 (02:04:40) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 15-08-2024 (02:04:45) {"object_kind":"push","event_name":"push","before":"77c94fc7da8bcb978fd5b62bff4e30e479fcf64a","after":"f19de02eb57c7e4673830e8a41e07cf3dd0aa46a","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"f19de02eb57c7e4673830e8a41e07cf3dd0aa46a","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"8b3bda8d4eb7a3f52150f8216433922491f885e2","message":"Splitting wj9unk.com into its own repository\n","title":"Splitting wj9unk.com into its own repository","timestamp":"2024-08-15T02:04:44+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/8b3bda8d4eb7a3f52150f8216433922491f885e2","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":["www/wj9unk/favicon.ico","www/wj9unk/index.html","www/wj9unk/international_amateur_radio_symbol.png","www/wj9unk/wj9unk.gif","www/wj9unk/wj9unk_1000px.png","www/wj9unk/wj9unk_2000px.png","www/wj9unk/wj9unk_2000px_whitebg.png","www/wj9unk/wj9unk_250px.png","www/wj9unk/wj9unk_500px.png","www/wj9unk/wj9unk_lowres.gif"]},{"id":"f19de02eb57c7e4673830e8a41e07cf3dd0aa46a","message":"Merge branch 'staging' into 'live'\n\nSplitting wj9unk.com into its own repository\n\nSee merge request edward/sandorlaboratories-com!28","title":"Merge branch 'staging' into 'live'","timestamp":"2024-08-15T02:04:44+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/f19de02eb57c7e4673830e8a41e07cf3dd0aa46a","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":["www/wj9unk/favicon.ico","www/wj9unk/index.html","www/wj9unk/international_amateur_radio_symbol.png","www/wj9unk/wj9unk.gif","www/wj9unk/wj9unk_1000px.png","www/wj9unk/wj9unk_2000px.png","www/wj9unk/wj9unk_2000px_whitebg.png","www/wj9unk/wj9unk_250px.png","www/wj9unk/wj9unk_500px.png","www/wj9unk/wj9unk_lowres.gif"]}],"total_commits_count":2,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 15-08-2024 (02:04:45) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com 77c94fc..f19de02 live -> origin/live 5d3ba59..e1ed782 staging -> origin/staging Updating 77c94fc..f19de02 Fast-forward www/wj9unk/favicon.ico | Bin 228542 -> 0 bytes www/wj9unk/index.html | 73 ---------------------- www/wj9unk/international_amateur_radio_symbol.png | Bin 57092 -> 0 bytes www/wj9unk/wj9unk.gif | Bin 2247467 -> 0 bytes www/wj9unk/wj9unk_1000px.png | Bin 212932 -> 0 bytes www/wj9unk/wj9unk_2000px.png | Bin 454589 -> 0 bytes www/wj9unk/wj9unk_2000px_whitebg.png | Bin 441254 -> 0 bytes www/wj9unk/wj9unk_250px.png | Bin 45915 -> 0 bytes www/wj9unk/wj9unk_500px.png | Bin 101441 -> 0 bytes www/wj9unk/wj9unk_lowres.gif | Bin 31769 -> 0 bytes 10 files changed, 73 deletions(-) delete mode 100644 www/wj9unk/favicon.ico delete mode 100644 www/wj9unk/index.html delete mode 100644 www/wj9unk/international_amateur_radio_symbol.png delete mode 100644 www/wj9unk/wj9unk.gif delete mode 100644 www/wj9unk/wj9unk_1000px.png delete mode 100644 www/wj9unk/wj9unk_2000px.png delete mode 100644 www/wj9unk/wj9unk_2000px_whitebg.png delete mode 100644 www/wj9unk/wj9unk_250px.png delete mode 100644 www/wj9unk/wj9unk_500px.png delete mode 100644 www/wj9unk/wj9unk_lowres.gif *** RESET TO HASH INITIATED *** HEAD is now at f19de02 Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 29-06-2025 (17:33:00) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === 29-06-2025 (17:33:09) {"object_kind":"push","event_name":"push","before":"f19de02eb57c7e4673830e8a41e07cf3dd0aa46a","after":"7bd4b1fc2fe0040b5c78ccc1228e4f0804d8bf47","ref":"refs/heads/live","ref_protected":true,"checkout_sha":"7bd4b1fc2fe0040b5c78ccc1228e4f0804d8bf47","message":null,"user_id":2,"user_name":"Ed Sandor","user_username":"edward","user_email":"public+git@sandorlaboratories.com","user_avatar":"https://git.sandorlaboratories.com/uploads/-/system/user/avatar/2/avatar.png","project_id":28,"project":{"id":28,"name":"sandorlaboratories.com","description":"Version controlling sandorlaboratories.com","web_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","avatar_url":null,"git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","namespace":"Ed Sandor","visibility_level":0,"path_with_namespace":"edward/sandorlaboratories-com","default_branch":"live","ci_config_path":null,"homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git"},"commits":[{"id":"7a06740a2e9dc6ea06fc4acdbe3dc49f2a055775","message":"Fixing a style\n","title":"Fixing a style","timestamp":"2024-08-02T20:59:55-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/7a06740a2e9dc6ea06fc4acdbe3dc49f2a055775","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"2f179a04c58a00040a6e3739db68a3cd1853de97","message":"Merge remote-tracking branch 'origin/live' into staging\n","title":"Merge remote-tracking branch 'origin/live' into staging","timestamp":"2024-08-02T21:00:02-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/2f179a04c58a00040a6e3739db68a3cd1853de97","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":[]},{"id":"58bb8d419cf32083fc5934e048d7cc879807f885","message":"Merge remote-tracking branch 'origin/live' into staging\n","title":"Merge remote-tracking branch 'origin/live' into staging","timestamp":"2024-08-02T21:04:47-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/58bb8d419cf32083fc5934e048d7cc879807f885","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":[]},{"id":"4f9de07b7d3f40d6767a8e7b2d0664e036ebef32","message":"QRZ Search\n","title":"QRZ Search","timestamp":"2024-08-02T21:06:14-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/4f9de07b7d3f40d6767a8e7b2d0664e036ebef32","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"fb52bebe197a4e9293abe8b84d74b1faec8e4a68","message":"Merge remote-tracking branch 'origin/live' into staging\n","title":"Merge remote-tracking branch 'origin/live' into staging","timestamp":"2024-08-02T21:08:01-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/fb52bebe197a4e9293abe8b84d74b1faec8e4a68","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":[]},{"id":"615dc519b6ffb351fa32572d20d13e89c68dde48","message":"Update wj9unk bio\n","title":"Update wj9unk bio","timestamp":"2024-08-02T21:26:46-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/615dc519b6ffb351fa32572d20d13e89c68dde48","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"9ea2e1c6f63d3ff6885f1bfa53c143c741fb6deb","message":"Merge remote-tracking branch 'origin/live' into staging\n","title":"Merge remote-tracking branch 'origin/live' into staging","timestamp":"2024-08-02T21:27:44-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/9ea2e1c6f63d3ff6885f1bfa53c143c741fb6deb","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":[]},{"id":"924d014b7bd5b5aa3bfb817ddd9f9b21072190af","message":"WJ9UNK Mastodon link\n","title":"WJ9UNK Mastodon link","timestamp":"2024-08-02T21:37:14-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/924d014b7bd5b5aa3bfb817ddd9f9b21072190af","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"e65d21a81b9c043409daf1bdcce0f91bdd05e7be","message":"Merge remote-tracking branch 'origin/live' into staging\n","title":"Merge remote-tracking branch 'origin/live' into staging","timestamp":"2024-08-02T21:38:04-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/e65d21a81b9c043409daf1bdcce0f91bdd05e7be","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":[]},{"id":"8e242010f00b887c9f727aeb8469394a01cf8d60","message":"WJ9UNK ISS\n","title":"WJ9UNK ISS","timestamp":"2024-08-02T22:02:28-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/8e242010f00b887c9f727aeb8469394a01cf8d60","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"398b4d58dbcfb10885ed0b44c3a152e82d458e89","message":"Merge remote-tracking branch 'origin/live' into staging\n","title":"Merge remote-tracking branch 'origin/live' into staging","timestamp":"2024-08-02T22:14:29-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/398b4d58dbcfb10885ed0b44c3a152e82d458e89","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":[]},{"id":"8c9738deedf0fba88e02c9340e776a747bfaba86","message":"W9JWC shoutout\n","title":"W9JWC shoutout","timestamp":"2024-08-02T22:57:19-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/8c9738deedf0fba88e02c9340e776a747bfaba86","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"3d974d0e76f726f17e54fa1cd9971d12ed7a58fc","message":"Merge remote-tracking branch 'origin/live' into staging\n","title":"Merge remote-tracking branch 'origin/live' into staging","timestamp":"2024-08-02T22:58:06-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/3d974d0e76f726f17e54fa1cd9971d12ed7a58fc","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":[]},{"id":"0f18ab46f5f18575f6c46ba77c5ae36303eb7017","message":"Center WJ9UNK H1\n","title":"Center WJ9UNK H1","timestamp":"2024-08-02T23:06:27-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/0f18ab46f5f18575f6c46ba77c5ae36303eb7017","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"f4964d8f1e152f18e52ca004b4c8da82330a1e5f","message":"Merge remote-tracking branch 'origin/live' into staging\n","title":"Merge remote-tracking branch 'origin/live' into staging","timestamp":"2024-08-02T23:07:05-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/f4964d8f1e152f18e52ca004b4c8da82330a1e5f","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":[]},{"id":"5d3ba597f7f4df60f9472d89e7ac3a8c57c810e2","message":"Updating footer\n","title":"Updating footer","timestamp":"2024-08-02T23:21:31-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/5d3ba597f7f4df60f9472d89e7ac3a8c57c810e2","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["www/wj9unk/index.html"],"removed":[]},{"id":"daa095a575deab38052f151eef905cc9dbbf4f7d","message":"Merge remote-tracking branch 'origin/live' into staging\n","title":"Merge remote-tracking branch 'origin/live' into staging","timestamp":"2024-08-02T23:31:38-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/daa095a575deab38052f151eef905cc9dbbf4f7d","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":[]},{"id":"e1ed782ab0d40bff1624c0fa7ed67f4d5529776b","message":"Split WJ9UNK.com to its own repository\n","title":"Split WJ9UNK.com to its own repository","timestamp":"2024-08-14T21:03:11-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/e1ed782ab0d40bff1624c0fa7ed67f4d5529776b","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":[],"removed":["www/wj9unk/favicon.ico","www/wj9unk/index.html","www/wj9unk/international_amateur_radio_symbol.png","www/wj9unk/wj9unk.gif","www/wj9unk/wj9unk_1000px.png","www/wj9unk/wj9unk_2000px.png","www/wj9unk/wj9unk_2000px_whitebg.png","www/wj9unk/wj9unk_250px.png","www/wj9unk/wj9unk_500px.png","www/wj9unk/wj9unk_lowres.gif"]},{"id":"7d7475f266f1e3ea467473f44cb34bda9c190f10","message":"Renewed intermediate CA\n","title":"Renewed intermediate CA","timestamp":"2025-06-29T12:17:51-05:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/7d7475f266f1e3ea467473f44cb34bda9c190f10","author":{"name":"Edward Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["ca_sandor_laboratories/certs/sandor_laboratories_intermediate_ca_edward_sandor.crt.pem"],"removed":[]},{"id":"7bd4b1fc2fe0040b5c78ccc1228e4f0804d8bf47","message":"Merge branch 'staging' into 'live'\n\nRenewing Intermediate CA\n\nSee merge request edward/sandorlaboratories-com!29","title":"Merge branch 'staging' into 'live'","timestamp":"2025-06-29T17:33:07+00:00","url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com/-/commit/7bd4b1fc2fe0040b5c78ccc1228e4f0804d8bf47","author":{"name":"Ed Sandor","email":"public+git@sandorlaboratories.com"},"added":[],"modified":["ca_sandor_laboratories/certs/sandor_laboratories_intermediate_ca_edward_sandor.crt.pem"],"removed":[]}],"total_commits_count":36,"push_options":{},"repository":{"name":"sandorlaboratories.com","url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","description":"Version controlling sandorlaboratories.com","homepage":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com","git_http_url":"https://git.sandorlaboratories.com/edward/sandorlaboratories-com.git","git_ssh_url":"git@git.sandorlaboratories.com:edward/sandorlaboratories-com.git","visibility_level":0}} *** AUTO PULL INITIATED *** 29-06-2025 (17:33:09) === ERROR: Pushed branch `` does not match BRANCH `refs/heads/live` === hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From git.sandorlaboratories.com:edward/sandorlaboratories-com f19de02..7bd4b1f live -> origin/live e1ed782..7d7475f staging -> origin/staging Updating f19de02..7bd4b1f Fast-forward ...oratories_intermediate_ca_edward_sandor.crt.pem | 153 ++++++++++----------- 1 file changed, 75 insertions(+), 78 deletions(-) *** RESET TO HASH INITIATED *** HEAD is now at 7bd4b1f Merge branch 'staging' into 'live' *** AUTO PULL COMPLETE *** 09-06-2026 (06:53:06) === ERROR: No token detected === *** ACCESS DENIED *** 09-06-2026 (18:03:45) === ERROR: No token detected === *** ACCESS DENIED *** 09-06-2026 (18:14:35) === ERROR: No token detected === *** ACCESS DENIED ***