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.

Sign up for GitHub

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

Jump to bottom

docs(proposal): server-side apply field manager proposal #17125

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Label vs annotation tracking

15ad3ba
Select commit
Loading
Failed to load commit list.
Open

docs(proposal): server-side apply field manager proposal #17125

Label vs annotation tracking
15ad3ba
Select commit
Loading
Failed to load commit list.
DCO / DCO required action Mar 4, 2024 in 1s

DCO

There are 12 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:

  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~12 --signoff
  3. Force push your changes to overwrite the branch: git push --force-with-lease origin ssa_field_manager_proposal

Summary

Commit sha: 85c8092, Author: Matthew Vaughan, Committer: Matthew Vaughan; The sign-off is missing.
Commit sha: 78b4e71, Author: Matthew Vaughan, Committer: Matthew Vaughan; The sign-off is missing.
Commit sha: 1af725c, Author: Matthew Vaughan, Committer: Matthew Vaughan; The sign-off is missing.
Commit sha: 4790b68, Author: Matthew Vaughan, Committer: Matthew Vaughan; The sign-off is missing.
Commit sha: f8a1004, Author: Matthew Vaughan, Committer: Matthew Vaughan; The sign-off is missing.
Commit sha: 343d0cc, Author: Matthew Vaughan, Committer: Matthew Vaughan; The sign-off is missing.
Commit sha: e414ef8, Author: Matthew Vaughan, Committer: Matthew Vaughan; The sign-off is missing.
Commit sha: a48e286, Author: Matthew Vaughan, Committer: Matthew Vaughan; The sign-off is missing.
Commit sha: a33fff0, Author: Matthew Vaughan, Committer: Matthew Vaughan; The sign-off is missing.
Commit sha: 7152821, Author: Matthew Vaughan, Committer: Matthew Vaughan; The sign-off is missing.
Commit sha: cac842d, Author: Matthew Vaughan, Committer: Matthew Vaughan; The sign-off is missing.
Commit sha: 15ad3ba, Author: Matthew Vaughan, Committer: Matthew Vaughan; The sign-off is missing.

View more details on DCO