Solve conflicts

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>

Author: cferreiragonz

include/fastrtps/config.h.in

@@ -130,4 +130,13 @@
 #define FASTDDS_SER_METHOD_DEPRECATED(major, entity_name, msg)
 #endif
 
+#if defined(_MSC_VER) && !defined(__clang__)
+#  define FASTDDS_UNREACHABLE() __assume(0)
+#elif defined(__GNUC__) || defined(__clang__)
+#  define FASTDDS_UNREACHABLE() __builtin_unreachable()
+#else
+#  include <cstdlib>
+#  define FASTDDS_UNREACHABLE() std::abort()
+#endif // if defined(_MSC_VER) && !defined(__clang__)
+
 #endif // _FASTRTPS_CONFIG_H_

src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp

@@ -279,16 +279,7 @@ void PDPSimple::announceParticipantState(
 #endif // HAVE_SECURITY
 
         auto endpoints = dynamic_cast<fastdds::rtps::SimplePDPEndpoints*>(builtin_endpoints_.get());
-<<<<<<< HEAD
         RTPSWriter& writer = *(endpoints->writer.writer_);
-=======
-        assert(endpoints && endpoints->writer.history_);
-        if (!endpoints || !endpoints->writer.history_)
-        {
-            FASTDDS_UNREACHABLE();       // “cannot happen” invariant
-        }
-
->>>>>>> 910ac9907 (Assert liveliness with periodic heartbeats in secure participants (#6411))
         WriterHistory& history = *(endpoints->writer.history_);
         PDP::announceParticipantState(writer, history, new_change, dispose, wp);