Received: from malur.postgresql.org ([217.196.149.56])
	by arkaria.postgresql.org with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <pgsql-hackers-owner+archive@lists.postgresql.org>)
	id 1tqFBo-001lnR-5d
	for pgsql-hackers@arkaria.postgresql.org; Thu, 06 Mar 2025 17:39:20 +0000
Received: from localhost ([127.0.0.1] helo=malur.postgresql.org)
	by malur.postgresql.org with esmtp (Exim 4.94.2)
	(envelope-from <pgsql-hackers-owner+archive@lists.postgresql.org>)
	id 1tqFBm-001yn6-Fw
	for pgsql-hackers@arkaria.postgresql.org; Thu, 06 Mar 2025 17:39:18 +0000
Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29])
	by malur.postgresql.org with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <me@jeltef.nl>)
	id 1tqFBm-001yj5-4n
	for pgsql-hackers@lists.postgresql.org; Thu, 06 Mar 2025 17:39:18 +0000
Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130])
	by magus.postgresql.org with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
	(Exim 4.96)
	(envelope-from <me@jeltef.nl>)
	id 1tqFBi-001L5Y-1C
	for pgsql-hackers@lists.postgresql.org;
	Thu, 06 Mar 2025 17:39:17 +0000
Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-549681574e0so1063780e87.2
        for <pgsql-hackers@lists.postgresql.org>; Thu, 06 Mar 2025 09:39:15 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=jeltef.nl; s=google; t=1741282755; x=1741887555; darn=lists.postgresql.org;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:from:to:cc:subject:date:message-id:reply-to;
        bh=QNI4siI3gesvl5FGtdbaXUo3qBsF7c2e85fxmLaFooI=;
        b=oR/OAWqNdvQULvmZ76JixQuFuyEa58JDJzKXhYIsYk4Gq1Ze7FxEgkHHt1iaIAaNCz
         fKlfeQnn67RoXpGjXerA2hRbcksUdeMN6Mo6dQ9lPFihSUmbmqZVuxSH9OsVjE8GkMsA
         oHHEav7DN6m7CM4gonuez0TxumTzHSCBY356ktvDOtM79Cew4GBog6et4riRjo3l6CAD
         V2ngHyOsCAG4yWwnoJY8/Pd098WaVGgHLucMrrYCZagoCoKHSbUtacR3y97vrAtw08w7
         if0otF7WpJlae2pDnKRVDLdEFfBqLKy8bIYmdHPz6j7EqOqThX51j6SQURRePcoxMZyX
         1aNg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1741282755; x=1741887555;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=QNI4siI3gesvl5FGtdbaXUo3qBsF7c2e85fxmLaFooI=;
        b=n6cq2j+vSirChC1AgCidqwyrVmORJyn0p/IfMTfblzjJgSCzWDbvcwsuZ1zToOxlfh
         pTQDZHbei0xF5TTdCjpr1Cdm8droS1sw2T8JXCHgnEVsfmme5QUgK+iezxemRvp3Qo6R
         usAinmdu9j4w8rgp1n9zGdPaF61h0ChzmX5IY2tqwnDMFXZl0SOy3l6oN5EXKkqDzqIg
         FAkfk99ZkgjvM60JPBJGnE4Fr+9shp2QNLcB2LOMMmFIfPykfqOG8EDAVl64FPkPbxqL
         OxRxEPs0zLYqQHZVUHRbRrlE0LiEvACi+cSD7gVH50vleXLGxXydPAelbBaApRfAVsWr
         nkSQ==
X-Forwarded-Encrypted: i=1; AJvYcCX0XdDipd2iaYIu2b7u81v55P0/x/TjWoPM+YYkbwAJoVRrMvOkN0v5khh6UoqmYI1FzEuh1VSDcrPi8WYt@lists.postgresql.org
X-Gm-Message-State: AOJu0Yyc3M42KQUZ4wXRoMp3W4nymkWGpS0iwUEy8Ls5r5Fk9EuNmfgp
	ouJcjdNDcuEJuQ57e8fNzrTZx/f9AHzAQAwt6OT9wX0PWWsxlGYx+MmuUWP+vF8fcE6NpoEvo7P
	+2LCyuRX2yehKtsWZDBqdozPkhMmNpcotA8qraw==
X-Gm-Gg: ASbGncszPwQoYi/GWyqe2Rsryq0/ZmWW05Z6pReR+m+x405FKmYo5Ds7PQxvzKFapoC
	9Wxq9ijp2yFs8v0DuIzwv/9HSwNP4w92A/ppkADMIt0RsmUeAVeNaBgAiID5TFhV/ejbSOTmAWG
	rgYtqJvZSRxpBjXXyDNBbuUweofnk=
X-Google-Smtp-Source: AGHT+IEX6nOQzXVZrvPiJFy+9OiCcwFzKpOh8enEFp/J1hcI8M0hzhvnb9O0BaJl7lmzKggWJA3vu7JoT/fAze/w1W8=
X-Received: by 2002:a05:6512:2342:b0:545:cc2:acd7 with SMTP id
 2adb3069b0e04-54990e67227mr7492e87.27.1741282754681; Thu, 06 Mar 2025
 09:39:14 -0800 (PST)
MIME-Version: 1.0
References: <CAGECzQTbHhaZMY-=Y=OGMU_jik4MqCfsc7rDf6AnT=Aq-B6cZA@mail.gmail.com>
 <CALDaNm3ta7UV_eD+ObgVsivGgPZSj1YqnO4-ojeBz10J95u7_A@mail.gmail.com>
 <CAGECzQSE7igwsTUk17i+RNEUL1zR-Zkp-1Zs7KkhmBxAu_Fksw@mail.gmail.com> <703819.1741281033@sss.pgh.pa.us>
In-Reply-To: <703819.1741281033@sss.pgh.pa.us>
From: Jelte Fennema-Nio <postgres@jeltef.nl>
Date: Thu, 6 Mar 2025 18:39:03 +0100
X-Gm-Features: AQ5f1Jo_ISThOrAjIvj6bTFCtIZ-OIVuV9bl2ZWWkabCeq5rPmTUbFSJRg12TIU
Message-ID: <CAGECzQRymvgXB9coGuGe7JY_qKWO2hcgVXDETrMEGOSfzKsTvg@mail.gmail.com>
Subject: Re: Commitfest app release on Feb 17 with many improvements
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: vignesh C <vignesh21@gmail.com>, 
	PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>, 
	Jacob Brazeal <jacob.brazeal@gmail.com>
Content-Type: text/plain; charset="UTF-8"
List-Id: <pgsql-hackers.lists.postgresql.org>
List-Help: <https://lists.postgresql.org/manage/>
List-Subscribe: <https://lists.postgresql.org/manage/>
List-Post: <mailto:pgsql-hackers@lists.postgresql.org>
List-Owner: <mailto:pgsql-hackers-owner@lists.postgresql.org>
List-Archive: <https://www.postgresql.org/list/pgsql-hackers>
Archived-At: <https://www.postgresql.org/message-id/CAGECzQRymvgXB9coGuGe7JY_qKWO2hcgVXDETrMEGOSfzKsTvg%40mail.gmail.com>
Precedence: bulk

On Thu, 6 Mar 2025 at 18:10, Tom Lane <tgl@sss.pgh.pa.us> wrote:
> Please see if you can make it use patch(1).  IME git is too
> stiff-necked about slightly stale patches no matter which
> subcommand you use.

It was using patch(1) in the past for that reason, but with --3way I
was able to get "git apply" to apply patches that patch(1) was unable
to apply. Also with the git command you get much more useful conflict
output.