cloudberry icon indicating copy to clipboard operation
cloudberry copied to clipboard
verified publisher icon apache

`cbdb-postgres-merge` has merge artifacts

Open kuraga opened this issue 2 months ago • 5 comments

cbdb-postgres-merge branch has Git merge artifacts since 0959648e12a6db95fd370b5584a170937bde3ab7, see an example.

kuraga avatar Oct 27 '25 08:10 kuraga

Hi, @kuraga welcome!🎊 Thanks for taking the time to point this out.🙌

github-actions[bot] avatar Oct 27 '25 08:10 github-actions[bot]

Hi @kuraga , thanks for reporting the issue 👍.

Currently, cbdb-postgres-merge is still in the middle of the development stage. We will address these issues later, clean the codes, and plan to submit a PR to merge the upgrade code into the main branch.

my-ship-it avatar Oct 27 '25 08:10 my-ship-it

Hi @kuraga would you like to help submit a PR to help fix this issue? The target branch is cbdb-postgres-merge.

tuhaihe avatar Nov 03 '25 02:11 tuhaihe

Unfortunately I am not familiar with the codebase and not able to solve merge conflicts.

kuraga avatar Nov 03 '25 09:11 kuraga

Unfortunately I am not familiar with the codebase and not able to solve merge conflicts.

No problem. I also forwarded this issue to @oppenheimer01 for notes. He will fix it later. Thanks for your report again.

tuhaihe avatar Nov 03 '25 09:11 tuhaihe