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.

Sign up for GitHub

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

Jump to bottom

CONFLICT_REPLACE to CONFLICT_IGNORE #1989

Merged
merged 1 commit into from
Dec 21, 2024
Merged

CONFLICT_REPLACE to CONFLICT_IGNORE #1989

merged 1 commit into from
Dec 21, 2024

Conversation

guanlisheng
Copy link
Contributor

CONFLICT_REPLACE => CONFLICT_IGNORE and return -1 to indicate failure

@guanlisheng guanlisheng changed the title Replace2ignore CONFLICT_REPLACE to CONFLICT_IGNORE Dec 21, 2024
@guanlisheng guanlisheng merged commit 0aab1fd into master Dec 21, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wolfsolver wolfsolver Awaiting requested review from wolfsolver

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@guanlisheng