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 ) id 1sjWHZ-001RVf-Ow for pgsql-committers@arkaria.postgresql.org; Thu, 29 Aug 2024 03:57:13 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1sjWHX-00E8e2-Dj for pgsql-committers@arkaria.postgresql.org; Thu, 29 Aug 2024 03:57:11 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sjWHX-00E8bJ-55 for pgsql-committers@lists.postgresql.org; Thu, 29 Aug 2024 03:57:11 +0000 Received: from mahout.postgresql.org ([2001:4800:3e1:1::227]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sjWHV-001x0C-7Q for pgsql-committers@lists.postgresql.org; Thu, 29 Aug 2024 03:57:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=postgresql.org; s=20171124; h=Date:Message-Id:Subject:To:From:MIME-Version: Content-Type:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:In-Reply-To:References; bh=gXFEmi/X0+2WD0ySwrIwXYvaaODlij/E3gD7bTN2+Pc=; b=PWkzo/n2KvJrM2aFxerfrddBrk 7/RfKoRsS1ZXKd9Euj9r/r0Gqqt/5cs4w8XBNpPpY4TzQFR86rcH5fWM8rCig22yeXrO7aNrGnZ4b GgNQNE93LvLC+ip7nevrxS9WWaBqe0nXy7+k607Ls40EVzJ3KcR9ebBlEMl7BnITSjFsjhkakQ1sr S+3FYPIdROkkRtESkZRuhSn2ErIAscyx55ea6PqezWc0dsEMRBUyabsmBq/dAYM5XkOQuhpDp+/VT etRUAOT5/zKZb84puAgj54LKFAmA9aIcnfOKo0UG9cla/gCFPGi2OVfKaqZAB98uRrZqtlePorank 9Y5undWA==; Received: from gemulon.postgresql.org ([2001:4800:3e1:1::198]) by mahout.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sjWHU-006Uz9-9V for pgsql-committers@lists.postgresql.org; Thu, 29 Aug 2024 03:57:08 +0000 Received: from localhost ([127.0.0.1] helo=gemulon.postgresql.org) by gemulon.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1sjWHT-001vFk-Vr for pgsql-committers@lists.postgresql.org; Thu, 29 Aug 2024 03:57:08 +0000 Content-Type: multipart/mixed; boundary="===============8691292862304010637==" MIME-Version: 1.0 From: Amit Kapila To: pgsql-committers@lists.postgresql.org Subject: pgsql: Rename the conflict types for the origin differ cases. X-Auto-Response-Suppress: All Auto-Submitted: auto-generated Message-Id: Date: Thu, 29 Aug 2024 03:57:08 +0000 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --===============8691292862304010637== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 UmVuYW1lIHRoZSBjb25mbGljdCB0eXBlcyBmb3IgdGhlIG9yaWdpbiBkaWZmZXIgY2FzZXMuCgpU aGUgY29uZmxpY3QgdHlwZXMgJ3VwZGF0ZV9kaWZmZXInIGFuZCAnZGVsZXRlX2RpZmZlcicgaW5k aWNhdGUgdGhhdCBhIHJvdwp0byBiZSBtb2RpZmllZCB3YXMgcHJldmlvdXNseSBhbHRlcmVkIGJ5 IGFub3RoZXIgb3JpZ2luLiBSZW5hbWUgdGhvc2UgdG8KJ3VwZGF0ZV9vcmlnaW5fZGlmZmVycycg YW5kICdkZWxldGVfb3JpZ2luX2RpZmZlcnMnIHRvIGNsYXJpZnkgdGhlaXIKbWVhbmluZy4KCkF1 dGhvcjogSG91IFpoaWppZQpSZXZpZXdlZC1ieTogU2h2ZXRhIE1hbGlrLCBQZXRlciBTbWl0aApE aXNjdXNzaW9uOiBodHRwczovL3Bvc3Rnci5lcy9tL0NBQTRlSzErSEVLd0dfVVl0NFp2d2g1b19I b0NLQ2pFR2VzUmpKWDM4eEFIM094dXVZQUBtYWlsLmdtYWlsLmNvbQoKQnJhbmNoCi0tLS0tLQpt YXN0ZXIKCkRldGFpbHMKLS0tLS0tLQpodHRwczovL2dpdC5wb3N0Z3Jlc3FsLm9yZy9wZy9jb21t aXRkaWZmLzY0MDE3OGM5MmUzZjZjNzRkMjc1MzY5YjI5MWI1MDc4MzRmMTMwOWUKCk1vZGlmaWVk IEZpbGVzCi0tLS0tLS0tLS0tLS0tCmRvYy9zcmMvc2dtbC9sb2dpY2FsLXJlcGxpY2F0aW9uLnNn bWwgICAgICB8ICA2ICsrKy0tLQpzcmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL2NvbmZs aWN0LmMgfCAxMiArKysrKystLS0tLS0Kc3JjL2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC93 b3JrZXIuYyAgIHwgIDYgKysrLS0tCnNyYy9pbmNsdWRlL3JlcGxpY2F0aW9uL2NvbmZsaWN0Lmgg ICAgICAgICB8ICA0ICsrLS0Kc3JjL3Rlc3Qvc3Vic2NyaXB0aW9uL3QvMDEzX3BhcnRpdGlvbi5w bCAgIHwgIDIgKy0Kc3JjL3Rlc3Qvc3Vic2NyaXB0aW9uL3QvMDMwX29yaWdpbi5wbCAgICAgIHwg IDQgKystLQo2IGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygt KQoK --===============8691292862304010637==--