Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update setup ros #68

Merged
merged 6 commits into from
Apr 17, 2024
Merged

Conversation

Rick-v-E
Copy link
Member

No description provided.

@Rick-v-E Rick-v-E merged commit d1453c0 into FieldRobotEvent:ros2 Apr 17, 2024
5 checks passed
github-actions bot pushed a commit that referenced this pull request Apr 17, 2024
(cherry picked from commit d1453c0)
Copy link
Contributor

The backport to main failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-main main
# Navigate to the new working tree
cd .worktrees/backport-main
# Create a new branch
git switch --create backport-68-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d1453c0db84f996aacb89e282c6e50c11d287b16
# Push it to GitHub
git push --set-upstream origin backport-68-to-main
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-main

Then, create a pull request where the base branch is main and the compare/head branch is backport-68-to-main.

Copy link
Contributor

The backport to ros2-gz failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-ros2-gz ros2-gz
# Navigate to the new working tree
cd .worktrees/backport-ros2-gz
# Create a new branch
git switch --create backport-68-to-ros2-gz
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d1453c0db84f996aacb89e282c6e50c11d287b16
# Push it to GitHub
git push --set-upstream origin backport-68-to-ros2-gz
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-ros2-gz

Then, create a pull request where the base branch is ros2-gz and the compare/head branch is backport-68-to-ros2-gz.

Rick-v-E added a commit that referenced this pull request Apr 17, 2024
(cherry picked from commit d1453c0)

Co-authored-by: Rick-v-E <[email protected]>
@Rick-v-E Rick-v-E deleted the update-setup-ros branch April 17, 2024 14:01
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.

1 participant