From: Junio C Hamano Date: Thu, 09 May 2024 15:46:56 GMT Subject: Re: [PATCH] gitlab-ci: fix installing dependencies for fuzz smoke tests Message-ID: In-Reply-To: <5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im> Patrick Steinhardt writes: > There was a semantic merge conflict between 9cdeb34b96 (ci: merge > scripts which install dependencies, 2024-04-12), which has merged > "ci/install-docker-dependencies.sh" into "ci/install-dependencies.sh" > and c7b228e000 (gitlab-ci: add smoke test for fuzzers, 2024-04-29), > which has added a new fuzz smoke test job that makes use of the > now-removed script. Ah, I should have been more carefully paying attention to what happens in ci/ directory (which I have largely been ignoring). Thanks for fixing it up.