search

jsduenass / ros2_documentation

ROS 2 docs repository
https://jsduenass.github.io/ros2_documentation
Creative Commons Attribution 4.0 International
0 stars 0 forks source link

Fix conflict in source/Installation/Alternatives/RHEL-Install-Binary.rst source/Installation/DDS-Implementations/Working-with-GurumNetworks-GurumDDS.rst source/Installation/RHEL-Install-RPMs.rst source/Installation/Testing.rst source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst source/Tutorials/Intermediate/Launch/Launch-system.rst source/index.rst #18

Closed jsduenass closed 1 year ago

jsduenass commented 1 year ago

Please resolve conflicts in next files: source/Installation/Alternatives/RHEL-Install-Binary.rst source/Installation/DDS-Implementations/Working-with-GurumNetworks-GurumDDS.rst source/Installation/RHEL-Install-RPMs.rst source/Installation/Testing.rst source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst source/Tutorials/Intermediate/Launch/Launch-system.rst source/index.rst

Complete message: Auto-merging conf.py Auto-merging source/Installation.rst Auto-merging 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 Auto-merging 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/RHEL-Install-RPMs.rst CONFLICT (content): Merge conflict in source/Installation/RHEL-Install-RPMs.rst Auto-merging source/Installation/Testing.rst CONFLICT (content): Merge conflict in source/Installation/Testing.rst Auto-merging source/Installation/_Apt-Repositories.rst Auto-merging 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/Intermediate/Launch/Launch-system.rst CONFLICT (content): Merge conflict in source/Tutorials/Intermediate/Launch/Launch-system.rst Auto-merging source/index.rst CONFLICT (content): Merge conflict in source/index.rst Automatic merge failed; fix conflicts and then commit the result.