Skip to content

fix: use logical OR instead of bitwise OR in conflict resolver #6492

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

Merged
Xuanwo merged 1 commit into from
Apr 13, 2026
+1 −1

Fix typo

c5cec50
Select commit
Loading
Failed to load commit list.
Sign in for the full log view
Merged

fix: use logical OR instead of bitwise OR in conflict resolver #6492

Fix typo
c5cec50
Select commit
Loading
Failed to load commit list.
Label PR
succeeded Apr 13, 2026 in 10s