TEST: DO NOT MERGE! #3750
TEST: DO NOT MERGE! #3750
DCO
There are 9 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~250 --signoff
- Force push your changes to overwrite the branch:
git push --force-with-lease origin iroha2-dev
Summary
Commit sha: 6080ba7, Author: 0x009922, Committer: GitHub; Can not find "0x009922 a.marcius26@gmail.com", in ["Dmitry Balashov a.marcius26@gmail.com", "Dmitry Balashov a.marcius26@gmail.com", "Dmitry Balashov a.marcius26@gmail.com"].
Commit sha: 8bcd351, Author: 0x009922, Committer: GitHub; Expected "0x009922 a.marcius26@gmail.com", but got "Dmitry Balashov a.marcius26@gmail.com".
Commit sha: a8d62b5, Author: Artemii Gerasimovich, Committer: GitHub; Expected "Artemii Gerasimovich mbee@protonmail.ch", but got "Artemii Gerasimovich gerasimovich@soramitsu.co.jp".
Commit sha: c9c5044, Author: astrokov7, Committer: Aleksandr Petrosyan; Expected "astrokov7 111361420+astrokov7@users.noreply.github.com", but got "alexstroke busyfifer@gmail.com".
Commit sha: f8892de, Author: astrokov7, Committer: Aleksandr Petrosyan; Expected "astrokov7 111361420+astrokov7@users.noreply.github.com", but got "alexstroke busyfifer@gmail.com".
Commit sha: 71343d5, Author: astrokov7, Committer: Aleksandr Petrosyan; Expected "astrokov7 111361420+astrokov7@users.noreply.github.com", but got "alexstroke busyfifer@gmail.com".
Commit sha: eca97e5, Author: astrokov7, Committer: Aleksandr Petrosyan; Expected "astrokov7 111361420+astrokov7@users.noreply.github.com", but got "alexstroke busyfifer@gmail.com".
Commit sha: 2fc4a9d, Author: BAStos525, Committer: GitHub; Expected "BAStos525 66615487+BAStos525@users.noreply.github.com", but got "BAStos525 jungle.vas@yandex.ru".
Commit sha: 99c9511, Author: Nickie S, Committer: GitHub; Expected "Nickie S DCNick3@users.noreply.github.com", but got "Nikita Strygin DCNick3@users.noreply.github.com".