This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git
commit b1bb0d61d3ddcaf8d13cdedbc201a3066c2975f3 Merge: 36ce8b1dc 578a6d50f Author: PengZheng <[email protected]> AuthorDate: Wed Apr 8 08:17:12 2026 +0800 Merge pull request #838 from apache/feature/option-conflict-detection Dependencies Option Conflict Detection. .devcontainer/devcontainer.json | 2 +- .github/workflows/conan_create.yml | 8 +-- .github/workflows/containers.yml | 1 + .github/workflows/coverage.yml | 2 + .github/workflows/fuzzing.yml | 1 + .github/workflows/macos.yml | 2 + .github/workflows/ubuntu.yml | 2 + conanfile.py | 102 ++++++++++++++++++----------- documents/building/README.md | 6 +- documents/building/dev_celix_with_clion.md | 34 +++------- 10 files changed, 92 insertions(+), 68 deletions(-)
