Merge: 2 -> main #110
Merge: 2 -> main #110
DCO
There is one commit incorrectly signed off. This means that the author of this commit failed to include a Signed-off-by line in the commit message.
To avoid having PRs blocked in the future, always include Signed-off-by: Author Name <authoremail@example.com>
in every commit message. You can also do this automatically by using the -s flag (i.e., git commit -s
).
Here is how to fix the problem so that this code can be merged.
Rebase the branch
If you have a local git environment and meet the criteria below, one option is to rebase the branch and add your Signed-off-by lines in the new commits. Please note that if others have already begun work based upon the commits in this branch, this solution will rewrite history and may cause serious issues for collaborators (described in the git documentation under "The Perils of Rebasing").
You should only do this if:
- You are the only author of the commits in this branch
- You are absolutely certain nobody else is doing any work based upon this branch
- There are no empty commits in the branch (for example, a DCO Remediation Commit which was added using
--allow-empty
)
To add your Signed-off-by line to every commit in this branch:
- Ensure you have a local copy of your branch by checking out the pull request locally via command line.
- In your local branch, run:
git rebase HEAD~12 --signoff
- Force push your changes to overwrite the branch:
git push --force-with-lease origin merge_2_main_20230926
Summary
Commit sha: 9bd589a, Author: Michael Carroll, Committer: GitHub; Expected "Michael Carroll michael@openrobotics.org", but got "Michael Carroll mjcarroll@intrinsic.ai".