Skip to content

Add Fictionlab projects to adopters.yaml#6419

Merged
ahcorde merged 1 commit intoros2:rollingfrom
jasiex01:patch-1
Apr 20, 2026
Merged

Add Fictionlab projects to adopters.yaml#6419
ahcorde merged 1 commit intoros2:rollingfrom
jasiex01:patch-1

Conversation

@jasiex01
Copy link
Copy Markdown
Contributor

Description

Added Leo Rover and Raph Rover from Fictionlab to adopters.yaml

Copy link
Copy Markdown
Collaborator

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fujitatomoya should we use the same entrance for both projects?

@fujitatomoya
Copy link
Copy Markdown
Collaborator

@ahcorde yes we can do that!

@fujitatomoya
Copy link
Copy Markdown
Collaborator

@Mergifyio rebase

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Apr 20, 2026

rebase

❌ Base branch update has failed

Details

Git reported the following error:

Rebasing (1/1)
Auto-merging source/The-ROS2-Project/Adopters/adopters.yaml
CONFLICT (content): Merge conflict in source/The-ROS2-Project/Adopters/adopters.yaml
error: could not apply 14d9f8a... Add Fictionlab projects to adopters.yaml
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 14d9f8a... Add Fictionlab projects to adopters.yaml

Copy link
Copy Markdown
Collaborator

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jasiex01 entries look good, can you rebase this?

Signed-off-by: Jan Hernas <40989249+jasiex01@users.noreply.github.com>
@jasiex01
Copy link
Copy Markdown
Contributor Author

@fujitatomoya done

@ahcorde ahcorde added the backport-all backport at reviewers discretion; from rolling to all versions label Apr 20, 2026
@ahcorde ahcorde merged commit d1751b4 into ros2:rolling Apr 20, 2026
7 checks passed
@jasiex01 jasiex01 deleted the patch-1 branch April 20, 2026 13:06
mergify Bot pushed a commit that referenced this pull request Apr 20, 2026
Signed-off-by: Jan Hernas <40989249+jasiex01@users.noreply.github.com>
(cherry picked from commit d1751b4)
mergify Bot pushed a commit that referenced this pull request Apr 20, 2026
Signed-off-by: Jan Hernas <40989249+jasiex01@users.noreply.github.com>
(cherry picked from commit d1751b4)
mergify Bot pushed a commit that referenced this pull request Apr 20, 2026
Signed-off-by: Jan Hernas <40989249+jasiex01@users.noreply.github.com>
(cherry picked from commit d1751b4)
ahcorde pushed a commit that referenced this pull request Apr 20, 2026
(cherry picked from commit d1751b4)

Signed-off-by: Jan Hernas <40989249+jasiex01@users.noreply.github.com>
Co-authored-by: Jan Hernas <40989249+jasiex01@users.noreply.github.com>
ahcorde pushed a commit that referenced this pull request Apr 20, 2026
(cherry picked from commit d1751b4)

Signed-off-by: Jan Hernas <40989249+jasiex01@users.noreply.github.com>
Co-authored-by: Jan Hernas <40989249+jasiex01@users.noreply.github.com>
ahcorde pushed a commit that referenced this pull request Apr 20, 2026
(cherry picked from commit d1751b4)

Signed-off-by: Jan Hernas <40989249+jasiex01@users.noreply.github.com>
Co-authored-by: Jan Hernas <40989249+jasiex01@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-all backport at reviewers discretion; from rolling to all versions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants