reshke commented on issue #1566: URL: https://github.com/apache/cloudberry/issues/1566#issuecomment-3862232224
7bc21ed8c8e - already applied d457cb4e8a5 - already applied 0980adfd4d0 - clean apply 52d5ea9adb0 - applied f0022a77d01 - clean apply 604651880c7 - first troublesome commit ``` reshke@yezzey-cbdb-bench:~/cbdb-pure$ git cherry-pick 604651880c7 Auto-merging src/backend/executor/spi.c CONFLICT (content): Merge conflict in src/backend/executor/spi.c Auto-merging src/backend/tcop/postgres.c CONFLICT (content): Merge conflict in src/backend/tcop/postgres.c Auto-merging src/backend/utils/mmgr/portalmem.c Auto-merging src/include/executor/spi.h Auto-merging src/pl/plperl/expected/plperl_transaction.out CONFLICT (content): Merge conflict in src/pl/plperl/expected/plperl_transaction.out Auto-merging src/pl/plperl/plperl.c Auto-merging src/pl/plperl/sql/plperl_transaction.sql CONFLICT (content): Merge conflict in src/pl/plperl/sql/plperl_transaction.sql Auto-merging src/pl/plpgsql/src/pl_exec.c Auto-merging src/pl/plpython/expected/plpython_transaction.out CONFLICT (content): Merge conflict in src/pl/plpython/expected/plpython_transaction.out Auto-merging src/pl/plpython/plpy_plpymodule.c Auto-merging src/pl/plpython/plpy_spi.c Auto-merging src/pl/plpython/plpy_spi.h Auto-merging src/pl/plpython/sql/plpython_transaction.sql CONFLICT (content): Merge conflict in src/pl/plpython/sql/plpython_transaction.sql error: could not apply 604651880c7... Fix SPI's handling of errors during transaction commit. hint: After resolving the conflicts, mark them with hint: "git add/rm <pathspec>", then run hint: "git cherry-pick --continue". hint: You can instead skip this commit with "git cherry-pick --skip". hint: To abort and get back to the state before "git cherry-pick", hint: run "git cherry-pick --abort". ``` -- 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]
