This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a change to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
discard f5788d8c828 Fix some conflict on utils/adt.
discard cb9c408bae4 Fix some conflict on utils/adt
discard abb9c6f5446 Fix all the conflicts for utils/init
discard 5fa595b586d Fix conflict for utils/init
discard 5d11d850c39 Fix some conflicts for utils/guc.c
discard 097d349828a Fix conflicts for storage/buffer
discard b067d75b099 Fix conflicts for storage/smgr
discard 5e48c8f3ba4 Fix conflicts for storage/ipc
discard 58ac0f9dcba Fix conflicts for storage/file
discard 3a86d6959cc Fix conflicts for storage/lmgr
discard 58168417285 Fix conflicts for replication
discard 752460093c6 Fix conflicts for postmaster
discard dbf2d4f0fd8 Fix conflict in gram.y for parser
discard e0ab09cbe92 Fix conflicts in c files for parser
discard 7de77aa790b Fix conflicts for optimizer
discard 0b3470da9d0 Fix conflict for path in optimizer
discard 5d62caf454e Fix all conflicts for executor
discard 1eb1623cf57 Fix some conflicts for executor
discard 2ed36fe0454 Fix all the conflicts for commands
discard 913684841d1 Fix conflicts in commands
discard a9eb3cce203 Fix some conflicts in commands
discard 117fb86d397 Fix some conflicts in commands
discard 4b2264321ae Fix conflicts for tcop
discard 6dcd2844229 Fix conflict for statistics
discard fb265f2dca5 Fix conflict for regex
discard 24afe8f333a Fix conflicts for jit
discard 67214d4cab3 Fix conflict for partitioning
discard 4cc8baa3b5d Fix conflict for main
discard a1b660b490a Fix conflict for libpq
discard cd038134caf Fix conflict for foreign
discard de30aa8ef4b Fix conflict for bootstrap
discard 4d4398b6202 Fix conflict for backup
discard 82b08cb302e Fix conflict for list.c makefunc.c
discard 61cd3617f01 Fix conflicts for c file in catalog
discard e659cd59ec5 Fix conflict for heap.c storage.c in catalog
discard 14c164974a1 Fix conflict for global makefile
discard 90037db4115 update configure
discard edbb869162a Fix conflicts in config and file aclocal.m4
discard 64545bf771a Fix configure.ac
discard 3c12bca960d Fix conflict for access/heap access/spgist
discard f3d7d1fb2aa Fix conflict on access/nbtree access/rmgrdesc
discard fb71083d172 Fix conflict on access transam
discard 95ee4ea01f0 Fix conflict for transam partly
discard ac071cd6f0d Fix conflict for access/brin
discard 210bf707568 Fix conflicts on include/utils
discard 7ba98441137 Fix conflicts on include/storage
discard 921c260349b Fix conflicts on include/parser
discard 81709f02dce Fix conflict for include/optimizer
discard 2479ae0c7e2 Fix conflicts on include/nodes
discard f7e0ee15c89 Fix conflicts on include libpq
discard be6666f1d66 Fix conflict on include/executor
discard bc6dfec4bcd Fix conflicts on backend/commands
discard cd1a2056920 Fix conflicts on backend/catalog
discard fa3c9187ad2 Fix conflicts for backend/access
discard 0959648e12a Merge tag 'REL_16_9' into merge16
new 4e49012c41b Merge tag 'REL_16_9' into merge3
new d31dd96b8d7 Fix conflicts for backend/access
new 79582b9f86b Fix conflicts on backend/catalog
new 93119d5076c Fix conflicts on backend/commands
new f2784d8304f Fix conflict on include/executor
new bdc76e1e070 Fix conflicts on include libpq
new 25ac3dad020 Fix conflicts on include/nodes
new 213bf50f7b5 Fix conflict for include/optimizer
new 805a2a86e6c Fix conflicts on include/parser
new 660f265bd31 Fix conflicts on include/storage
new 5f2220877e4 Fix conflicts on include/utils
new ce402991007 Fix conflict for access/brin
new addbe4cabb7 Fix conflict for transam partly
new 5cebce326e8 Fix conflict on access transam
new b34db83d01c Fix conflict on access/nbtree access/rmgrdesc
new 56644002723 Fix conflict for access/heap access/spgist
new 2a331a20553 Fix configure.ac
new 122a13feba0 Fix conflicts in config and file aclocal.m4
new d79e18e6dfd update configure
new ca1132bfedf Fix conflict for global makefile
new 43da790f29d Fix conflict for heap.c storage.c in catalog
new e05ab012e5e Fix conflicts for c file in catalog
new 2e809790d23 Fix conflict for list.c makefunc.c
new fed8053c891 Fix conflict for backup
new 7c5d88db05a Fix conflict for bootstrap
new feb788e717e Fix conflict for foreign
new f894a3a7f6b Fix conflict for libpq
new 763be493f37 Fix conflict for main
new 00038e7da06 Fix conflict for partitioning
new fa518efe439 Fix conflicts for jit
new 551f0069aad Fix conflict for regex
new 66c70770e4e Fix conflict for statistics
new 5d721da3b8b Fix conflicts for tcop
new 2782b7bf3bc Fix some conflicts in commands
new 13f02a0f6b4 Fix some conflicts in commands
new 32ee1f124d7 Fix conflicts in commands
new f79cd748fc6 Fix all the conflicts for commands
new 3c3260256ca Fix some conflicts for executor
new be619aa2773 Fix all conflicts for executor
new 650fc21afd8 Fix conflict for path in optimizer
new dce6e269cf4 Fix conflicts for optimizer
new 8eb1e519dfa Fix conflicts in c files for parser
new 6d0e694be9a Fix conflict in gram.y for parser
new 0e4dc0f0410 Fix conflicts for postmaster
new f608dbe6abf Fix conflicts for replication
new 07651251204 Fix conflicts for storage/lmgr
new 38026d6b030 Fix conflicts for storage/file
new 5ab2dacc3ce Fix conflicts for storage/ipc
new d3492df5232 Fix conflicts for storage/smgr
new 215e4ef5985 Fix conflicts for storage/buffer
new 176d6486a07 Fix some conflicts for utils/guc.c
new 2a1043bd5a0 Fix conflict for utils/init
new fd09475c1cd Fix all the conflicts for utils/init
new bd2cd64fffd Fix some conflict on utils/adt
new 3d559af6ac2 Fix some conflict on utils/adt.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f5788d8c828)
\
N -- N -- N refs/heads/cbdb-postgres-merge (3d559af6ac2)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 55 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cloudberry.apache.org
For additional commands, e-mail: commits-h...@cloudberry.apache.org
