Please resolve conflicts in next files:
source/Installation/_Windows-Install-Prerequisites.rst
source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst
Complete message:
Auto-merging conf.py
Auto-merging source/How-To-Guides/Using-Python-Packages.rst
Auto-merging source/Installation/DDS-Implementations/Working-with-eProsima-Fast-DDS.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-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
Automatic merge failed; fix conflicts and then commit the result.
Please resolve conflicts in next files: source/Installation/_Windows-Install-Prerequisites.rst source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst
Complete message: Auto-merging conf.py Auto-merging source/How-To-Guides/Using-Python-Packages.rst Auto-merging source/Installation/DDS-Implementations/Working-with-eProsima-Fast-DDS.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-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 Automatic merge failed; fix conflicts and then commit the result.