From 941919b5d0fe63895a830c84aa45aa6bb7bb8d61 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Thu, 14 May 2026 20:47:22 -0700 Subject: [PATCH 1/2] Mention Jupyter Notebook early in the ros2_tracing analysis tutorial (#6764) Signed-off-by: Christophe Bedard (cherry picked from commit baf33b04498da995158b7b408d4a2026311281a2) # Conflicts: # source/Tutorials/Advanced/ROS2-Tracing-Trace-and-Analyze.rst --- source/Tutorials/Advanced/ROS2-Tracing-Trace-and-Analyze.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/Tutorials/Advanced/ROS2-Tracing-Trace-and-Analyze.rst b/source/Tutorials/Advanced/ROS2-Tracing-Trace-and-Analyze.rst index 32f12a868d5..866cdea4ae0 100644 --- a/source/Tutorials/Advanced/ROS2-Tracing-Trace-and-Analyze.rst +++ b/source/Tutorials/Advanced/ROS2-Tracing-Trace-and-Analyze.rst @@ -9,9 +9,14 @@ Overview This tutorial covers: +<<<<<<< HEAD 1. installing tracing-related tools and building ROS 2 with the core instrumentation enabled 2. running and tracing a ``performance_test`` run 3. analyzing the trace data using `tracetools_analysis `_ to plot the callback durations +======= +1. running and tracing a ``performance_test`` run +2. analyzing the trace data using `tracetools_analysis `_ to plot the callback durations using `Jupyter Notebook `_ +>>>>>>> baf33b04 (Mention Jupyter Notebook early in the ros2_tracing analysis tutorial (#6764)) Prerequisites ------------- From 1882f2ce54816b613f8c882fcda8fda0de47806b Mon Sep 17 00:00:00 2001 From: Tomoya Fujita Date: Fri, 15 May 2026 12:52:36 +0900 Subject: [PATCH 2/2] resolve conflict. Signed-off-by: Tomoya Fujita --- .../Tutorials/Advanced/ROS2-Tracing-Trace-and-Analyze.rst | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/source/Tutorials/Advanced/ROS2-Tracing-Trace-and-Analyze.rst b/source/Tutorials/Advanced/ROS2-Tracing-Trace-and-Analyze.rst index 866cdea4ae0..b0d3915fd94 100644 --- a/source/Tutorials/Advanced/ROS2-Tracing-Trace-and-Analyze.rst +++ b/source/Tutorials/Advanced/ROS2-Tracing-Trace-and-Analyze.rst @@ -9,14 +9,9 @@ Overview This tutorial covers: -<<<<<<< HEAD 1. installing tracing-related tools and building ROS 2 with the core instrumentation enabled 2. running and tracing a ``performance_test`` run -3. analyzing the trace data using `tracetools_analysis `_ to plot the callback durations -======= -1. running and tracing a ``performance_test`` run -2. analyzing the trace data using `tracetools_analysis `_ to plot the callback durations using `Jupyter Notebook `_ ->>>>>>> baf33b04 (Mention Jupyter Notebook early in the ros2_tracing analysis tutorial (#6764)) +3. analyzing the trace data using `tracetools_analysis `_ to plot the callback durations using `Jupyter Notebook `_ Prerequisites -------------