Skip to content

Conversation

@sdebionne
Copy link
Contributor

@sdebionne sdebionne commented Nov 18, 2025

Description

Fixes #775

Ports #767 from develop to master ~mloskot

References

Permission granted to merge this fixup on master for 1.90:

https://lists.boost.org/archives/list/boost@lists.boost.org/message/RVU7AKXUXA6X6K3MG4ZEQZ5WIWVW7I5E/

@sdebionne sdebionne requested a review from mloskot November 18, 2025 09:15
@sdebionne sdebionne self-assigned this Nov 18, 2025
@sdebionne
Copy link
Contributor Author

@mloskot Do you know the way to handle "late" commit to master when we can't / don't want to merge everything from develop?

@mloskot
Copy link
Member

mloskot commented Nov 18, 2025

@sdebionne

Do you know the way to handle "late" commit to master when we can't / don't want to merge everything from develop?

I don't know any general Boost policy, but I know some maintainers decided to cherry-pick commits.

I recall this old discussion on the merge policy in #663 where we seem to decided we prefer true merges, but we also don't object cherry-picking.

@sdebionne
Copy link
Contributor Author

Thanks! I did cherry-pick first before creating this PR, hoping to bypass this issue:

To github.com:boostorg/gil.git
 ! [remote rejected]     master -> master (protected branch hook declined)

But no luck. How can I temporarily disable the protection on master? I does not look I have the permission for that (unavailable in the repo settings).

@mloskot
Copy link
Member

mloskot commented Nov 18, 2025

@sdebionne

How can I temporarily disable the protection on master? I does not look I have the permission for that

Please, try again. You should be able to see it now :)

@sdebionne
Copy link
Contributor Author

I am adding the doc fixup as well since we don't need permission for that. The CI is stuck, but I suppose this PR lacks the necessary fixes.

I am planning to fix the CI and merge develop for the next release.

@sdebionne sdebionne changed the title fix compile error on clang Fix compile error on clang and documentation Nov 19, 2025
Copy link
Member

@mloskot mloskot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

@sdebionne sdebionne merged commit 7eee435 into master Nov 19, 2025
1 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants