adoroszlai commented on PR #5764:
URL: https://github.com/apache/ozone/pull/5764#issuecomment-1851417731
> How does their CI build not find the compile failure?
Events:
* last PR build for HDDS-9303: HEAD is now at 8eb8805 Merge
89b1c07f306d9d4ede735ef7f2b9f9e5cc5754ce into
eb7e8d009e701d1dc7a792deca1b5d6893d051c0
* ... (many commits on `master`)
* last PR build for HDDS-9816: HEAD is now at a1eec72 Merge
61e2881f2ecec5bce314a08e48e0507dbcc1213a into
3c9df5cf3292b2feb0ffa1aa9c254b1c51c8cb9a
* ... (few commits on `master`)
* HDDS-9303 is merged as dd431cde68
* ... (many commits on `master`)
* HDDS-9816 is merged as 94f539d700
Git reports conflict for the second PR if commits on `master` edit the same
lines, but it doesn't know about code syntax/semantics.
If I remember correctly there is an option in Github to only allow PR merge
if its branch is up-to-date with the base branch. But that requires more work
for both developers and CI.
The current behavior is similar to optimistic locking in DBs. I think it's
fine in most cases.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
