fix: [cherry-pick] selfhealattemptscount needs to be reset at times (#22095) #22582
DCO
There are 10 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~66 --signoff - Force push your changes to overwrite the branch:
git push --force-with-lease origin cherry-pick-e6f94f-release-2.14
Summary
Commit sha: ed242b9, Author: Anand Francis Joseph, Committer: GitHub; Can not find "Anand Francis Joseph anjoseph@redhat.com", in ["dependabot[bot] support@github.com", "anandf anjoseph@redhat.com"].
Commit sha: defd4be, Author: Anand Francis Joseph, Committer: GitHub; Expected "Anand Francis Joseph anjoseph@redhat.com", but got "anandf anjoseph@redhat.com".
Commit sha: 896a461, Author: Andrii Korotkov, Committer: GitHub; Expected "Andrii Korotkov 137232734+andrii-korotkov-verkada@users.noreply.github.com", but got "Andrii Korotkov andrii.korotkov@verkada.com".
Commit sha: 872319e, Author: Atif Ali, Committer: GitHub; Expected "Atif Ali 56743004+aali309@users.noreply.github.com", but got "Atif Ali atali@redhat.com".
Commit sha: 67b2336, Author: Ishita Sequeira, Committer: GitHub; Expected "Ishita Sequeira 46771830+ishitasequeira@users.noreply.github.com", but got "Ishita Sequeira ishiseq29@gmail.com".
Commit sha: 2b422d2, Author: Nitish Kumar, Committer: GitHub; Expected "Nitish Kumar justnitish06@gmail.com", but got "nitishfy justnitish06@gmail.com".
Commit sha: cb1df5d, Author: Nitish Kumar, Committer: GitHub; Expected "Nitish Kumar justnitish06@gmail.com", but got "nitishfy justnitish06@gmail.com".
Commit sha: c868711, Author: Peter Jiang, Committer: GitHub; Expected "Peter Jiang 35584807+pjiang-dev@users.noreply.github.com", but got "Peter Jiang peterjiang823@gmail.com".
Commit sha: 4745e08, Author: rumstead, Committer: GitHub; The sign-off is missing.
Commit sha: d59c85c, Author: Siddhesh Ghadi, Committer: GitHub; Expected "Siddhesh Ghadi 61187612+svghadi@users.noreply.github.com", but got "Siddhesh Ghadi sghadi1203@gmail.com".