fix merge

.github/workflows/client.yml

@@ -2,7 +2,7 @@ name: libs/client-sdk
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, server-side ]
     paths-ignore:
       - '**.md' #Do not need to run CI for markdown changes.
   pull_request:
@@ -16,12 +16,12 @@ jobs:
     env:
       # Port the test service (implemented in this repo) should bind to.
       TEST_SERVICE_PORT: 8123
-      TEST_SERVICE_BINARY: ./build/contract-tests/sdk-contract-tests/sdk-tests
+      TEST_SERVICE_BINARY: ./build/contract-tests/client-contract-tests/client-tests
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/ci
         with:
-          cmake_target: sdk-tests
+          cmake_target: client-tests
           run_tests: false
       - name: 'Launch test service as background task'
         run: $TEST_SERVICE_BINARY $TEST_SERVICE_PORT 2>&1 &

examples/client-and-server-coexistence/main.c

@@ -48,4 +48,3 @@ int main() {
 
     return 0;
 }
->>>>>>> main

libs/common/include/launchdarkly/data/evaluation_detail.hpp

@@ -65,32 +65,11 @@ class EvaluationDetail {
      */
     [[nodiscard]] std::optional<EvaluationReason> const& Reason() const;
 
-    /**
-     * Check if an evaluation reason exists, and if so, if it is of a particular
-     * kind.
-     * @param kind Kind to check.
-     * @return True if a reason exists and matches the given kind.
-     */
-    [[nodiscard]] bool ReasonKindIs(enum EvaluationReason::Kind kind) const;
-
-    /**
-     * @return True if the evaluation resulted in an error.
-     * TODO(sc209960)
-     */
-    [[nodiscard]] bool IsError() const;
-
     /**
      * @return A reference to the variation value.
      */
     T const& operator*() const;
 
-    /**
-     * @return True if the evaluation was successful (i.e. IsError returns
-     * false.)
-     * TODO(sc209960)
-     */
-    explicit operator bool() const;
-
    private:
     T value_;
     std::optional<std::size_t> variation_index_;

libs/internal/src/serialization/json_context_kind.cpp

@@ -31,4 +31,3 @@ void tag_invoke(boost::json::value_from_tag const& unused,
 }
 }  // namespace data_model
 }  // namespace launchdarkly
->>>>>>> main