Merge upstream/release/2.6 into upstream/google/2.6 #15460
DCO
There are 18 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:
- 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~35 --signoff
- Force push your changes to overwrite the branch:
git push --force-with-lease origin mjmac/google/2.6
Summary
Commit sha: 42a0d35, Author: Alexander Oganezov, Committer: GitHub; Expected "Alexander Oganezov [email protected]", but got "Alexander A Oganezov [email protected]".
Commit sha: 23f0787, Author: Alexander Oganezov, Committer: GitHub; Can not find "Alexander Oganezov [email protected]", in ["Alexander A Oganezov [email protected]", "Liang Zhen [email protected]"].
Commit sha: 4637c00, Author: Joseph Moore, Committer: GitHub; Expected "Joseph Moore [email protected]", but got "Joseph Moore [email protected]".
Commit sha: cb9d278, Author: Ken Cain, Committer: GitHub; Expected "Ken Cain [email protected]", but got "Kenneth Cain [email protected]".
Commit sha: 4c49f36, Author: Ken Cain, Committer: GitHub; Expected "Ken Cain [email protected]", but got "Kenneth Cain [email protected]".
Commit sha: bde13c3, Author: mjean308, Committer: GitHub; Expected "mjean308 [email protected]", but got "Maureen Jean [email protected]".
Commit sha: f8682fb, Author: Nasf-Fan, Committer: GitHub; Expected "Nasf-Fan [email protected]", but got "Fan Yong [email protected]".
Commit sha: c821379, Author: Nasf-Fan, Committer: GitHub; Expected "Nasf-Fan [email protected]", but got "Fan Yong [email protected]".
Commit sha: 1ae3f29, Author: Nasf-Fan, Committer: GitHub; Expected "Nasf-Fan [email protected]", but got "Fan Yong [email protected]".
Commit sha: 2819d45, Author: Nasf-Fan, Committer: GitHub; Expected "Nasf-Fan [email protected]", but got "Fan Yong [email protected]".
Commit sha: ec3aa1c, Author: Nasf-Fan, Committer: GitHub; Expected "Nasf-Fan [email protected]", but got "Fan Yong [email protected]".
Commit sha: 70b12e3, Author: Nasf-Fan, Committer: GitHub; Expected "Nasf-Fan [email protected]", but got "Fan Yong [email protected]".
Commit sha: 67da3b9, Author: Nasf-Fan, Committer: GitHub; Expected "Nasf-Fan [email protected]", but got "Fan Yong [email protected]".
Commit sha: f7d12a4, Author: Nasf-Fan, Committer: GitHub; Expected "Nasf-Fan [email protected]", but got "Fan Yong [email protected]".
Commit sha: d9f16a1, Author: Tomasz Gromadzki, Committer: GitHub; Expected "Tomasz Gromadzki [email protected]", but got "Jan Michalski [email protected]".
Commit sha: 76cfb41, Author: wiliamhuang, Committer: GitHub; Expected "wiliamhuang [email protected]", but got "Lei Huang [email protected]".
Commit sha: eb95b55, Author: wiliamhuang, Committer: GitHub; Expected "wiliamhuang [email protected]", but got "Lei Huang [email protected]".
Commit sha: cf2a8b9, Author: wiliamhuang, Committer: GitHub; Expected "wiliamhuang [email protected]", but got "Lei Huang [email protected]".