Closed jsduenass closed 1 year ago
Please resolve conflicts in next files: source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst
Complete message: Auto-merging conf.py Auto-merging source/Concepts/About-ROS-2-Client-Libraries.rst Auto-merging source/How-To-Guides/Using-Python-Packages.rst Auto-merging source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst Auto-merging source/The-ROS2-Project/Contributing/Developer-Guide.rst Auto-merging source/Tutorials/Advanced/Discovery-Server/Discovery-Server.rst Auto-merging source/Tutorials/Advanced/FastDDS-Configuration.rst Auto-merging source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst CONFLICT (content): Merge conflict in source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst Auto-merging source/Tutorials/Beginner-Client-Libraries/Creating-A-Workspace/Creating-A-Workspace.rst Auto-merging source/Tutorials/Intermediate/Testing/CLI.rst Automatic merge failed; fix conflicts and then commit the result.
Please resolve conflicts in next files: source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst
Complete message: Auto-merging conf.py Auto-merging source/Concepts/About-ROS-2-Client-Libraries.rst Auto-merging source/How-To-Guides/Using-Python-Packages.rst Auto-merging source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst Auto-merging source/The-ROS2-Project/Contributing/Developer-Guide.rst Auto-merging source/Tutorials/Advanced/Discovery-Server/Discovery-Server.rst Auto-merging source/Tutorials/Advanced/FastDDS-Configuration.rst Auto-merging source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst CONFLICT (content): Merge conflict in source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst Auto-merging source/Tutorials/Beginner-Client-Libraries/Creating-A-Workspace/Creating-A-Workspace.rst Auto-merging source/Tutorials/Intermediate/Testing/CLI.rst Automatic merge failed; fix conflicts and then commit the result.