reshke commented on issue #1566:
URL: https://github.com/apache/cloudberry/issues/1566#issuecomment-3905054020
da9a28fd556. conflicts:
```
reshke@yezzey-cbdb-bench:~/cloudberry$ git diff
src/backend/utils/adt/ruleutils.c
diff --cc src/backend/utils/adt/ruleutils.c
index cdbd27d4d95,5d83953f775..00000000000
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@@ -57,7 -53,7 +57,11 @@@
#include "parser/parse_func.h"
#include "parser/parse_node.h"
#include "parser/parse_oper.h"
++<<<<<<< HEAD
+#include "parser/parse_cte.h"
++=======
+ #include "parser/parse_relation.h"
++>>>>>>> da9a28fd556 (Fix ruleutils issues with dropped cols in
functions-returning-composite.)
#include "parser/parser.h"
#include "parser/parsetree.h"
#include "rewrite/rewriteHandler.h"
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
