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

Merge release 1.12 master #1350

Merged
merged 7 commits into from
Oct 4, 2023

Merge branch 'master' into merge_rel_1.12_master

7a09fd6
Select commit
Loading
Failed to load commit list.
Merged

Merge release 1.12 master #1350

Merge branch 'master' into merge_rel_1.12_master
7a09fd6
Select commit
Loading
Failed to load commit list.
DCO / DCO required action Oct 4, 2023 in 1s

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 <[email protected]> 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~7 --signoff
  3. Force push your changes to overwrite the branch: git push --force-with-lease origin merge_rel_1.12_master

Summary

Commit sha: 0c99afb, Author: Josh van Leeuwen, Committer: GitHub; Can not find "Josh van Leeuwen [email protected]", in ["joshvanl [email protected]", "joshvanl [email protected]", "joshvanl [email protected]", "joshvanl [email protected]", "joshvanl [email protected]", "joshvanl [email protected]", "joshvanl [email protected]", "joshvanl [email protected]", "joshvanl [email protected]", "joshvanl [email protected]"].