fix(skills): resolve skill file reads home-root first as documented - #1284
fix(skills): resolve skill file reads home-root first as documented#1284Mohith26 wants to merge 2 commits into
DCO
There are 2 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.
Preferred method: Commit author adds a DCO remediation commit
A DCO Remediation Commit contains special text in the commit message that applies a missing Signed-off-by line in a subsequent commit. The primary benefit of this method is that the project’s history does not change, and there is no risk of breaking someone else’s work.
These authors can unblock this PR by adding a new commit to this branch with the following text in their commit message:
Mohith Gajjela <109003762+Mohith26@users.noreply.github.com>
DCO Remediation Commit for Mohith Gajjela <109003762+Mohith26@users.noreply.github.com>
I, Mohith Gajjela <109003762+Mohith26@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 8e205fb8f4a45a09cf6d2c13987d7fd63f1aa7d1
I, Mohith Gajjela <109003762+Mohith26@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 30a5de6f1afddffb9d93eb59269a4c5d850a7627
Signed-off-by: Mohith Gajjela <109003762+Mohith26@users.noreply.github.com>
Please note: You should avoid adding empty commits (i.e., git commit -s --allow-empty), because these will be discarded if someone rebases the branch / repo.
Least preferred method: 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~2 --signoff - Force push your changes to overwrite the branch:
git push --force-with-lease origin fix/skill-file-resolution-order
Summary
Commit sha: 8e205fb, Author: Mohith Gajjela, Committer: Mohith Gajjela; The sign-off is missing.
Commit sha: 30a5de6, Author: Mohith Gajjela, Committer: Mohith Gajjela; The sign-off is missing.