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

Humble release 12: August 23 #4644

Merged
merged 16 commits into from
Aug 24, 2024

fix merge conflict with humble sync

13e8b14
Select commit
Loading
Failed to load commit list.
Merged

Humble release 12: August 23 #4644

fix merge conflict with humble sync
13e8b14
Select commit
Loading
Failed to load commit list.
DCO / DCO required action Aug 23, 2024 in 0s

DCO

There are 13 commits incorrectly signed off. This means that the author(s) of these commits failed to include a Signed-off-by line in their 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:

  1. Ensure you have a local copy of your branch by checking out the pull request locally via command line.
  2. In your local branch, run: git rebase HEAD~16 --signoff
  3. Force push your changes to overwrite the branch: git push --force-with-lease origin humble_sync

Summary

Commit sha: e0f78e5, Author: GoesM, Committer: stevemacenski; Expected "GoesM 130988564+GoesM@users.noreply.github.com", but got "goes GoesM@buaa.edu.cn".
Commit sha: 9c9cea2, Author: GoesM, Committer: stevemacenski; Expected "GoesM 130988564+GoesM@users.noreply.github.com", but got "GoesM_server GoesM@buaa.edu.cn".
Commit sha: 11cad89, Author: GoesM, Committer: stevemacenski; Can not find "GoesM 130988564+GoesM@users.noreply.github.com", in ["GoesM goesm@buaa.edu.cn", "GoesM goesm@buaa.edu.cn", "GoesM goesm@buaa.edu.cn", "GoesM goesm@buaa.edu.cn", "GoesM goesm@buaa.edu.cn"].
Commit sha: 1daf261, Author: Ivan Radionov, Committer: stevemacenski; Can not find "Ivan Radionov 45877502+JJRedmond@users.noreply.github.com", in ["Ivan Radionov i.a.radionov@gmail.com.com", "Steve Macenski stevenmacenski@gmail.com", "Ivan Radionov i.a.radionov@gmail.com.com", "Ivan Radionov i.a.radionov@gmail.com.com", "Steve Macenski stevenmacenski@gmail.com"].
Commit sha: 06ec958, Author: Joni Pöllänen, Committer: stevemacenski; Expected "Joni Pöllänen jonipol@users.noreply.github.com", but got "Joni Pöllänen joni.pollanen@karelics.fi".
Commit sha: 324bcdd, Author: Kemal Bektas, Committer: stevemacenski; Expected "Kemal Bektas 34746077+bektaskemal@users.noreply.github.com", but got "Kemal Bektas kemal.bektas@node-robotics.com".
Commit sha: b3fce7b, Author: Rein Appeldoorn, Committer: stevemacenski; Expected "Rein Appeldoorn reinzor@gmail.com", but got "Rein Appeldoorn rein.appeldoorn@nobleo.nl".
Commit sha: 2fe76a2, Author: Saitama, Committer: stevemacenski; Expected "Saitama gennartan@users.noreply.github.com", but got "Antoine Gennart gennart.antoine@gmail.com".
Commit sha: 9ec978c, Author: Saitama, Committer: stevemacenski; Expected "Saitama gennartan@users.noreply.github.com", but got "Antoine Gennart gennartan@disroot.org".
Commit sha: c86b1a9, Author: Steve Macenski, Committer: Steve Macenski; The sign-off is missing.
Commit sha: 3865eca, Author: Steve Macenski, Committer: Steve Macenski; The sign-off is missing.
Commit sha: 13e8b14, Author: Steve Macenski, Committer: Steve Macenski; The sign-off is missing.
Commit sha: 7309106, Author: Vincent, Committer: stevemacenski; Expected "Vincent 46542431+VincidaB@users.noreply.github.com", but got "Vincent Belpois vincent.belpois@gmail.com".