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

Add citation file #71

Merged
merged 2 commits into from
May 25, 2024
Merged

Add citation file #71

merged 2 commits into from
May 25, 2024

Conversation

Rick-v-E
Copy link
Member

No description provided.

Copy link
Collaborator

@Darkproduct Darkproduct left a comment

Choose a reason for hiding this comment

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

Looks good to me. I have no experience using cff files but the file name is obvious.

@Darkproduct Darkproduct merged commit 648c152 into FieldRobotEvent:ros2 May 25, 2024
8 checks passed
Copy link
Contributor

The backport to ros2-ign 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-ign ros2-ign
# Navigate to the new working tree
cd .worktrees/backport-ros2-ign
# Create a new branch
git switch --create backport-71-to-ros2-ign
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 648c15296b50f5864ab7a8a200b77dcee0f837bd
# Push it to GitHub
git push --set-upstream origin backport-71-to-ros2-ign
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-ros2-ign

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

Copy link
Contributor

The backport to main 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-main main
# Navigate to the new working tree
cd .worktrees/backport-main
# Create a new branch
git switch --create backport-71-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 648c15296b50f5864ab7a8a200b77dcee0f837bd
# Push it to GitHub
git push --set-upstream origin backport-71-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-71-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-71-to-ros2-gz
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 648c15296b50f5864ab7a8a200b77dcee0f837bd
# Push it to GitHub
git push --set-upstream origin backport-71-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-71-to-ros2-gz.

Rick-v-E pushed a commit to Rick-v-E/virtual_maize_field that referenced this pull request May 27, 2024
Add citation file

(cherry picked from commit 648c152)
Rick-v-E pushed a commit to Rick-v-E/virtual_maize_field that referenced this pull request May 27, 2024
Add citation file

(cherry picked from commit 648c152)
Rick-v-E added a commit that referenced this pull request May 27, 2024
* Merge pull request #71 from Rick-v-E/ros2

Add citation file

(cherry picked from commit 648c152)

---------

Co-authored-by: Darkproduct <[email protected]>
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.

2 participants