Git Mailing List Archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <>
To: Patrick Steinhardt <>
Subject: Re: [PATCH] gitlab-ci: fix installing dependencies for fuzz smoke tests
Date: Thu, 09 May 2024 08:46:56 -0700	[thread overview]
Message-ID: <xmqq8r0jvvgv.fsf@gitster.g> (raw)
In-Reply-To: <> (Patrick Steinhardt's message of "Thu, 9 May 2024 10:25:27 +0200")

Patrick Steinhardt <> writes:

> There was a semantic merge conflict between 9cdeb34b96 (ci: merge
> scripts which install dependencies, 2024-04-12), which has merged
> "ci/" into "ci/"
> 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.

      reply	other threads:[~2024-05-09 15:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-09  8:25 [PATCH] gitlab-ci: fix installing dependencies for fuzz smoke tests Patrick Steinhardt
2024-05-09 15:46 ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq8r0jvvgv.fsf@gitster.g \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).