Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add custom sql segment conditional support acmestack#76,fix #75 supplementary submit #77

Closed
wants to merge 8 commits into from

Conversation

PhoenixL0911
Copy link
Contributor

@PhoenixL0911 PhoenixL0911 commented Sep 15, 2023

add custom sql segment conditional support #76
fix bug: #75 supplementary submit

@PhoenixL0911 PhoenixL0911 changed the title fix bug: acmestack#75 supplementary submit feat: add custom sql segment conditional support acmestack#76,fix #75 supplementary submit Sep 15, 2023
@afumu
Copy link
Member

afumu commented Sep 15, 2023

@DeerSunny 合并产生冲突产生了,请解决好冲突重新提交一下哈。下次再有新代码合并,最好重新建一个分支,如果在旧分支提交,每次合并的时候都会带有之前的提交记录,不利于合并新的代码。

@afumu
Copy link
Member

afumu commented Sep 15, 2023

@DeerSunny 所有提交的新代码,最好也加上测试代码

@PhoenixL0911 PhoenixL0911 closed this by deleting the head repository Oct 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants