Fix conflict in source/Installation/Alternatives/Fedora-Development-Setup.rst 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/RHEL-Install-RPMs.rst source/Installation/Ubuntu-Install-Debians.rst source/Installation/Windows-Install-Binary.rst source/Installation/_Windows-Install-Prerequisites.rst source/Tutorials/Intermediate/Launch/Launch-system.rst

[fmrico]

Please resolve conflicts in next files: source/Installation/Alternatives/Fedora-Development-Setup.rst 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/RHEL-Install-RPMs.rst source/Installation/Ubuntu-Install-Debians.rst source/Installation/Windows-Install-Binary.rst source/Installation/_Windows-Install-Prerequisites.rst source/Tutorials/Intermediate/Launch/Launch-system.rst

Complete message: Auto-merging conf.py Auto-merging source/Installation.rst Auto-merging source/Installation/Alternatives.rst CONFLICT (modify/delete): source/Installation/Alternatives/Fedora-Development-Setup.rst deleted in upstream/rolling and modified in HEAD. Version HEAD of source/Installation/Alternatives/Fedora-Development-Setup.rst left in tree. 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-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/_Windows-Install-Prerequisites.rst CONFLICT (content): Merge conflict in source/Installation/_Windows-Install-Prerequisites.rst Auto-merging source/Tutorials/Beginner-CLI-Tools/Introducing-Turtlesim/Introducing-Turtlesim.rst Auto-merging source/Tutorials/Intermediate/Launch/Launch-system.rst CONFLICT (content): Merge conflict in source/Tutorials/Intermediate/Launch/Launch-system.rst Automatic merge failed; fix conflicts and then commit the result.