Closed jsduenass closed 1 year ago
Please resolve conflicts in next files: source/Installation/Alternatives/Latest-Development-Setup.rst source/Installation/Alternatives/RHEL-Development-Setup.rst source/Installation/Alternatives/RHEL-Install-Binary.rst source/Installation/Alternatives/Ubuntu-Development-Setup.rst source/Installation/Alternatives/Ubuntu-Install-Binary.rst source/Installation/Alternatives/Windows-Development-Setup.rst source/Installation/Alternatives/macOS-Development-Setup.rst source/Installation/DDS-Implementations/Working-with-GurumNetworks-GurumDDS.rst source/Installation/RHEL-Install-RPMs.rst source/Installation/Ubuntu-Install-Debians.rst source/Installation/Windows-Install-Binary.rst source/Installation/_Windows-Install-Prerequisites.rst source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst source/Tutorials/Beginner-CLI-Tools/Introducing-Turtlesim/Introducing-Turtlesim.rst source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Nodes/Understanding-ROS2-Nodes.rst source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Parameters/Understanding-ROS2-Parameters.rst source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Topics/Understanding-ROS2-Topics.rst source/Tutorials/Demos/Rosbag-with-ROS1-Bridge.rst source/Tutorials/Intermediate/Launch/Using-Event-Handlers.rst source/index.rst
Complete message: Auto-merging conf.py Auto-merging source/Installation.rst Auto-merging source/Installation/Alternatives/Latest-Development-Setup.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/Latest-Development-Setup.rst Auto-merging source/Installation/Alternatives/RHEL-Development-Setup.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/RHEL-Development-Setup.rst Auto-merging source/Installation/Alternatives/RHEL-Install-Binary.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/RHEL-Install-Binary.rst Auto-merging source/Installation/Alternatives/Ubuntu-Development-Setup.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/Ubuntu-Development-Setup.rst Auto-merging source/Installation/Alternatives/Ubuntu-Install-Binary.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/Ubuntu-Install-Binary.rst Auto-merging source/Installation/Alternatives/Windows-Development-Setup.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/Windows-Development-Setup.rst Auto-merging source/Installation/Alternatives/macOS-Development-Setup.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/macOS-Development-Setup.rst Auto-merging source/Installation/DDS-Implementations/Working-with-GurumNetworks-GurumDDS.rst CONFLICT (content): Merge conflict in source/Installation/DDS-Implementations/Working-with-GurumNetworks-GurumDDS.rst Auto-merging source/Installation/DDS-Implementations/Working-with-eProsima-Fast-DDS.rst Auto-merging source/Installation/RHEL-Install-RPMs.rst CONFLICT (content): Merge conflict in source/Installation/RHEL-Install-RPMs.rst Auto-merging source/Installation/Ubuntu-Install-Debians.rst CONFLICT (content): Merge conflict in source/Installation/Ubuntu-Install-Debians.rst Auto-merging source/Installation/Windows-Install-Binary.rst CONFLICT (content): Merge conflict in source/Installation/Windows-Install-Binary.rst Auto-merging source/Installation/_Apt-Repositories.rst Auto-merging source/Installation/_Windows-Install-Prerequisites.rst CONFLICT (content): Merge conflict in source/Installation/_Windows-Install-Prerequisites.rst Auto-merging source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst CONFLICT (content): Merge conflict in source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst Auto-merging source/Tutorials/Beginner-CLI-Tools/Introducing-Turtlesim/Introducing-Turtlesim.rst CONFLICT (content): Merge conflict in source/Tutorials/Beginner-CLI-Tools/Introducing-Turtlesim/Introducing-Turtlesim.rst Auto-merging source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Nodes/Understanding-ROS2-Nodes.rst CONFLICT (content): Merge conflict in source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Nodes/Understanding-ROS2-Nodes.rst Auto-merging source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Parameters/Understanding-ROS2-Parameters.rst CONFLICT (content): Merge conflict in source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Parameters/Understanding-ROS2-Parameters.rst Auto-merging source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Topics/Understanding-ROS2-Topics.rst CONFLICT (content): Merge conflict in source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Topics/Understanding-ROS2-Topics.rst Auto-merging source/Tutorials/Demos/Rosbag-with-ROS1-Bridge.rst CONFLICT (content): Merge conflict in source/Tutorials/Demos/Rosbag-with-ROS1-Bridge.rst Auto-merging source/Tutorials/Demos/dummy-robot-demo.rst Auto-merging source/Tutorials/Intermediate/Launch/Using-Event-Handlers.rst CONFLICT (content): Merge conflict in source/Tutorials/Intermediate/Launch/Using-Event-Handlers.rst Auto-merging source/index.rst CONFLICT (content): Merge conflict in source/index.rst Automatic merge failed; fix conflicts and then commit the result.
Please resolve conflicts in next files: source/Installation/Alternatives/Latest-Development-Setup.rst source/Installation/Alternatives/RHEL-Development-Setup.rst source/Installation/Alternatives/RHEL-Install-Binary.rst source/Installation/Alternatives/Ubuntu-Development-Setup.rst source/Installation/Alternatives/Ubuntu-Install-Binary.rst source/Installation/Alternatives/Windows-Development-Setup.rst source/Installation/Alternatives/macOS-Development-Setup.rst source/Installation/DDS-Implementations/Working-with-GurumNetworks-GurumDDS.rst source/Installation/RHEL-Install-RPMs.rst source/Installation/Ubuntu-Install-Debians.rst source/Installation/Windows-Install-Binary.rst source/Installation/_Windows-Install-Prerequisites.rst source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst source/Tutorials/Beginner-CLI-Tools/Introducing-Turtlesim/Introducing-Turtlesim.rst source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Nodes/Understanding-ROS2-Nodes.rst source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Parameters/Understanding-ROS2-Parameters.rst source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Topics/Understanding-ROS2-Topics.rst source/Tutorials/Demos/Rosbag-with-ROS1-Bridge.rst source/Tutorials/Intermediate/Launch/Using-Event-Handlers.rst source/index.rst
Complete message: Auto-merging conf.py Auto-merging source/Installation.rst Auto-merging source/Installation/Alternatives/Latest-Development-Setup.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/Latest-Development-Setup.rst Auto-merging source/Installation/Alternatives/RHEL-Development-Setup.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/RHEL-Development-Setup.rst Auto-merging source/Installation/Alternatives/RHEL-Install-Binary.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/RHEL-Install-Binary.rst Auto-merging source/Installation/Alternatives/Ubuntu-Development-Setup.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/Ubuntu-Development-Setup.rst Auto-merging source/Installation/Alternatives/Ubuntu-Install-Binary.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/Ubuntu-Install-Binary.rst Auto-merging source/Installation/Alternatives/Windows-Development-Setup.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/Windows-Development-Setup.rst Auto-merging source/Installation/Alternatives/macOS-Development-Setup.rst CONFLICT (content): Merge conflict in source/Installation/Alternatives/macOS-Development-Setup.rst Auto-merging source/Installation/DDS-Implementations/Working-with-GurumNetworks-GurumDDS.rst CONFLICT (content): Merge conflict in source/Installation/DDS-Implementations/Working-with-GurumNetworks-GurumDDS.rst Auto-merging source/Installation/DDS-Implementations/Working-with-eProsima-Fast-DDS.rst Auto-merging source/Installation/RHEL-Install-RPMs.rst CONFLICT (content): Merge conflict in source/Installation/RHEL-Install-RPMs.rst Auto-merging source/Installation/Ubuntu-Install-Debians.rst CONFLICT (content): Merge conflict in source/Installation/Ubuntu-Install-Debians.rst Auto-merging source/Installation/Windows-Install-Binary.rst CONFLICT (content): Merge conflict in source/Installation/Windows-Install-Binary.rst Auto-merging source/Installation/_Apt-Repositories.rst Auto-merging source/Installation/_Windows-Install-Prerequisites.rst CONFLICT (content): Merge conflict in source/Installation/_Windows-Install-Prerequisites.rst Auto-merging source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst CONFLICT (content): Merge conflict in source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst Auto-merging source/Tutorials/Beginner-CLI-Tools/Introducing-Turtlesim/Introducing-Turtlesim.rst CONFLICT (content): Merge conflict in source/Tutorials/Beginner-CLI-Tools/Introducing-Turtlesim/Introducing-Turtlesim.rst Auto-merging source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Nodes/Understanding-ROS2-Nodes.rst CONFLICT (content): Merge conflict in source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Nodes/Understanding-ROS2-Nodes.rst Auto-merging source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Parameters/Understanding-ROS2-Parameters.rst CONFLICT (content): Merge conflict in source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Parameters/Understanding-ROS2-Parameters.rst Auto-merging source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Topics/Understanding-ROS2-Topics.rst CONFLICT (content): Merge conflict in source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Topics/Understanding-ROS2-Topics.rst Auto-merging source/Tutorials/Demos/Rosbag-with-ROS1-Bridge.rst CONFLICT (content): Merge conflict in source/Tutorials/Demos/Rosbag-with-ROS1-Bridge.rst Auto-merging source/Tutorials/Demos/dummy-robot-demo.rst Auto-merging source/Tutorials/Intermediate/Launch/Using-Event-Handlers.rst CONFLICT (content): Merge conflict in source/Tutorials/Intermediate/Launch/Using-Event-Handlers.rst Auto-merging source/index.rst CONFLICT (content): Merge conflict in source/index.rst Automatic merge failed; fix conflicts and then commit the result.