`cbdb-postgres-merge` has merge artifacts

[kuraga]

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

[github-actions]

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

[my-ship-it]

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.

[tuhaihe]

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

[kuraga]

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

[tuhaihe]

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.