This is an automated email from the ASF dual-hosted git repository.
reshke pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new f685ff99f89 Remove rebase marker from .gitignore (#1488)
f685ff99f89 is described below
commit f685ff99f89edc6b28229d80feba165f5a310572
Author: reshke <[email protected]>
AuthorDate: Thu Dec 11 14:37:17 2025 +0500
Remove rebase marker from .gitignore (#1488)
---
.gitignore | 6 ------
contrib/pg_visibility/pg_visibility.c | 7 -------
2 files changed, 13 deletions(-)
diff --git a/.gitignore b/.gitignore
index da03d66b9a0..b0e7d748507 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,14 +10,11 @@
*.so.[0-9]
*.so.[0-9].[0-9]
*.so.[0-9].[0-9][0-9]
-<<<<<<< HEAD
*.sl
*.sl.[0-9]
*.sl.[0-9].[0-9]
*.sl.[0-9].[0-9][0-9]
*.swp
-=======
->>>>>>> REL_16_9
*.dylib
*.dll
*.exp
@@ -80,9 +77,6 @@ lib*.pc
/CMakeLists.txt
/compile_commands.json
/tmp_install/
-<<<<<<< HEAD
/.cache/
/install/
-=======
/portlock/
->>>>>>> REL_16_9
diff --git a/contrib/pg_visibility/pg_visibility.c
b/contrib/pg_visibility/pg_visibility.c
index 8324eb1b25c..87d7ecfc79a 100644
--- a/contrib/pg_visibility/pg_visibility.c
+++ b/contrib/pg_visibility/pg_visibility.c
@@ -787,14 +787,7 @@ tuple_all_visible(Relation rel, HeapTuple tup,
TransactionId OldestXmin, Buffer
static void
check_relation_relkind(Relation rel)
{
-<<<<<<< HEAD
- if (rel->rd_rel->relkind != RELKIND_RELATION &&
- rel->rd_rel->relkind != RELKIND_MATVIEW &&
- rel->rd_rel->relkind != RELKIND_TOASTVALUE &&
- rel->rd_rel->relkind != RELKIND_DIRECTORY_TABLE)
-=======
if (!RELKIND_HAS_TABLE_AM(rel->rd_rel->relkind))
->>>>>>> REL_16_9
ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("relation \"%s\" is of wrong relation
kind",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
