Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 3, 2025

Description

I have added the following hooks as part of the pre-commit:

  • end-of-file-fixer
  • mixed-line-ending
  • trailing-whitespace

This prevents empty whitespace and additional newlines from registering as a separate commit during development.

Additional Information

Signed-off-by: Leander Stephen D'Souza <leanderdsouza1234@gmail.com>
(cherry picked from commit 6e5a588)

# Conflicts:
#	source/Tutorials/Intermediate/Publishing-Messages-Using-YAML-Files.rst
@mergify
Copy link
Contributor Author

mergify bot commented Apr 3, 2025

Cherry-pick of 6e5a588 has failed:

On branch mergify/bp/jazzy/pr-5203
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit 6e5a588.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .devcontainer/devcontainer.json
	modified:   LICENSE
	modified:   source/How-To-Guides/Migrating-from-ROS1/Migrating-Interfaces.rst
	modified:   source/How-To-Guides/Using-ros1_bridge-Jammy-upstream.rst
	modified:   source/Installation/DDS-Implementations/Working-with-eProsima-Fast-DDS.rst
	modified:   source/Installation/_Apt-Upgrade-Admonition.rst
	modified:   source/Installation/_Dnf-Update-Admonition.rst
	modified:   source/Releases/Galactic-Geochelone-Complete-Changelog.rst
	modified:   source/Releases/Humble-Hawksbill-Complete-Changelog.rst
	modified:   source/Releases/Iron-Irwini-Complete-Changelog.rst
	modified:   source/Releases/Jazzy-Jalisco-Complete-Changelog.rst
	modified:   source/Tutorials/Demos.rst
	modified:   source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-CPP.rst

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   source/Tutorials/Intermediate/Publishing-Messages-Using-YAML-Files.rst

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Apr 3, 2025
@github-actions
Copy link

github-actions bot commented Apr 3, 2025

HTML artifacts: https://github.com/ros2/ros2_documentation/actions/runs/14254505458/artifacts/2879390533.

To view the resulting site:

  1. Click on the above link to download the artifacts archive
  2. Extract it
  3. Open html-artifacts-5209/index.html in your favorite browser

@fujitatomoya
Copy link
Collaborator

code base is different, i will go ahead to close this. if anybody works on this backport, feel free to reopen this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants