fix: cleanup dangling parents in route and policy statuses #7307
DCO
There are 15 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:
- 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~47 --signoff - Force push your changes to overwrite the branch:
git push --force-with-lease origin fix-statuses-with-multiple-parents
Summary
Commit sha: 3c310a2, Author: Arko Dasgupta, Committer: GitHub; Expected "Arko Dasgupta arkodg@users.noreply.github.com", but got "Arko Dasgupta arko@tetrate.io".
Commit sha: 26e03ed, Author: Arko Dasgupta, Committer: GitHub; Can not find "Arko Dasgupta arkodg@users.noreply.github.com", in ["Arko Dasgupta arko@tetrate.io", "Arko Dasgupta arko@tetrate.io"].
Commit sha: c18aa74, Author: Fabian Bao, Committer: GitHub; Expected "Fabian Bao fabian.v.bao@gmail.com", but got "fabian4 fabian.v.bao@gmail.com".
Commit sha: 0fb96ec, Author: Huabing (Robin) Zhao, Committer: GitHub; Expected "Huabing (Robin) Zhao zhaohuabing@gmail.com", but got "Huabing Zhao zhaohuabing@gmail.com".
Commit sha: c853061, Author: Huabing (Robin) Zhao, Committer: GitHub; Expected "Huabing (Robin) Zhao zhaohuabing@gmail.com", but got "Huabing Zhao zhaohuabing@gmail.com".
Commit sha: c9c7340, Author: Huabing (Robin) Zhao, Committer: GitHub; Expected "Huabing (Robin) Zhao zhaohuabing@gmail.com", but got "Huabing Zhao zhaohuabing@gmail.com".
Commit sha: 4af9a89, Author: Huabing (Robin) Zhao, Committer: GitHub; Can not find "Huabing (Robin) Zhao zhaohuabing@gmail.com", in ["Huabing Zhao zhaohuabing@gmail.com", "Huabing Zhao zhaohuabing@gmail.com", "Huabing Zhao zhaohuabing@gmail.com"].
Commit sha: b086308, Author: Inode1, Committer: GitHub; Expected "Inode1 makarichevivan@gmail.com", but got "i.makarychev i.makarychev@tbank.ru".
Commit sha: a9fa022, Author: Joe Tauke, Committer: GitHub; Expected "Joe Tauke 92036968+isujtauke@users.noreply.github.com", but got "Joe Tauke jtauke@iastate.edu".
Commit sha: 2067f4c, Author: Kota Kimura, Committer: GitHub; Expected "Kota Kimura 86363983+kkk777-7@users.noreply.github.com", but got "kkk777-7 kota.kimura0725@gmail.com".
Commit sha: 89e8256, Author: Kota Kimura, Committer: GitHub; Can not find "Kota Kimura 86363983+kkk777-7@users.noreply.github.com", in ["kkk777-7 kota.kimura0725@gmail.com", "kkk777-7 kota.kimura0725@gmail.com"].
Commit sha: 4312f38, Author: shreealt, Committer: GitHub; Can not find "shreealt shreemaanabhishek@apache.org", in ["Shreemaan Abhishek shreemaanabhishek@apache.org", "Shreemaan Abhishek shreemaanabhishek@apache.org", "Shreemaan Abhishek shreemaanabhishek@apache.org", "Shreemaan Abhishek shreemaanabhishek@apache.org", "Shreemaan Abhishek shreemaanabhishek@apache.org", "Shreemaan Abhishek shreemaanabhishek@apache.org", "Shreemaan Abhishek shreemaanabhishek@apache.org"].
Commit sha: 97eb42c, Author: Siddharth Shah, Committer: GitHub; Can not find "Siddharth Shah siddharth.shah@nutanix.com", in ["siddharth1036 siddharth.shah@nutanix.com", "siddharth1036 siddharth.shah@nutanix.com"].
Commit sha: 36a23a6, Author: 聪, Committer: GitHub; Expected "聪 q1875486458@gmail.com", but got "cong q1875486458@gmail.com".
Commit sha: 7cb5f72, Author: 聪, Committer: GitHub; Expected "聪 q1875486458@gmail.com", but got "cong q1875486458@gmail.com".