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/2.6 into google/2.6 #15663

Closed
wants to merge 33 commits into from

Merge remote-tracking branch 'origin/release/2.6' into juszhan/google…

3269fc9
Select commit
Loading
Failed to load commit list.
Closed

Merge release/2.6 into google/2.6 #15663

Merge remote-tracking branch 'origin/release/2.6' into juszhan/google…
3269fc9
Select commit
Loading
Failed to load commit list.
DCO / DCO required action Dec 23, 2024 in 0s

DCO

There are 11 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 <[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~33 --signoff
  3. Force push your changes to overwrite the branch: git push --force-with-lease origin juszhan/google/2.6

Summary

Commit sha: bdea4aa, Author: Alexander Oganezov, Committer: GitHub; Expected "Alexander Oganezov [email protected]", but got "Alexander A Oganezov [email protected]".
Commit sha: b1b52e3, Author: Dalton Bohning, Committer: GitHub; Expected "Dalton Bohning [email protected]", but got "Maureen Jean [email protected]".
Commit sha: 332f412, Author: Dalton Bohning, Committer: GitHub; Expected "Dalton Bohning [email protected]", but got "Jeff Olivier [email protected]".
Commit sha: a4f8be7, Author: Dalton Bohning, Committer: GitHub; Expected "Dalton Bohning [email protected]", but got "Jinshan Xiong [email protected]".
Commit sha: adc26ae, Author: James Nunez, Committer: GitHub; Expected "James Nunez [email protected]", but got "James A. Nunez [email protected]".
Commit sha: c631702, Author: Kris Jacque, Committer: GitHub; Expected "Kris Jacque [email protected]", but got "Kris Jacque [email protected]".
Commit sha: baa6a87, Author: Kris Jacque, Committer: GitHub; Expected "Kris Jacque [email protected]", but got "Brian J. Murrell [email protected]".
Commit sha: cd77d05, Author: Liang Zhen, Committer: GitHub; Expected "Liang Zhen [email protected]", but got "Phil Henderson [email protected]".
Commit sha: d238ceb, Author: Liu Xuezhao, Committer: GitHub; Expected "Liu Xuezhao [email protected]", but got "Xuezhao Liu [email protected]".
Commit sha: ebccb75, Author: Liu Xuezhao, Committer: GitHub; Expected "Liu Xuezhao [email protected]", but got "Xuezhao Liu [email protected]".
Commit sha: da9001e, Author: Nasf-Fan, Committer: GitHub; Expected "Nasf-Fan [email protected]", but got "Fan Yong [email protected]".