Skip to content

Fix resolve token conflict logic under race condition #7554

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

Open
alexqyle wants to merge 4 commits into
base: master
Choose a base branch
from
+80 −8

only keep doing conflict check while instance is in joining state

c82bf04
Select commit
Loading
Failed to load commit list.
Open

Fix resolve token conflict logic under race condition #7554

only keep doing conflict check while instance is in joining state
c82bf04
Select commit
Loading
Failed to load commit list.
DCO / DCO succeeded May 25, 2026 in 1s

DCO

All commits are signed off!

View more details on DCO