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

Possible race condition when merging PR's #211

Open
HugoPeters1024 opened this issue Apr 5, 2023 · 0 comments
Open

Possible race condition when merging PR's #211

HugoPeters1024 opened this issue Apr 5, 2023 · 0 comments

Comments

@HugoPeters1024
Copy link

HugoPeters1024 commented Apr 5, 2023 •
edited by FPtje

Observed a week after the fix in #209.

Observed in an internal PR. It looks very similar to the original issue with the extra artifact that the following comment is posted by Hoff

Empty rebase. Have the changes already been merged into the target branch? Aborting.

Which suggests that the check for 'are there any changes?' and the actual merging of the changes are in the wrong order. Possibly introduced by the sleep to remedy the other race condition in #209

Thusfar only observed once so it hard to reproduce :(
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@HugoPeters1024