Skip to content

Fix rebase conflicts

668214a
Select commit
Loading
Failed to load commit list.
Open

Add Proxy and SSL Config Options to Python SDK #3180

Fix rebase conflicts
668214a
Select commit
Loading
Failed to load commit list.
DCO / DCO required action Feb 4, 2025 in 1s

DCO

There are 26 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~112 --signoff
  3. Force push your changes to overwrite the branch: git push --force-with-lease origin add-requests-options

Summary

Commit sha: db4d975, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: f5cee70, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: d8f141a, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: b5d67d1, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: 337afa0, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: 52e8ea4, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: b988e82, Author: AT, Committer: cgivre; Can not find "AT manyoso@users.noreply.github.com", in ["Adam Treat treat.adam@gmail.com", "Jared Van Bortel jared@nomic.ai", "Victor 158754254+SINAPSA-IC@users.noreply.github.com"].
Commit sha: 6fedb79, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: cb00613, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: 33d7166, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: b2b9be4, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: d0d857d, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: a49c2cf, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: 68d4ed7, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: 5ee9b97, Author: AT, Committer: cgivre; Can not find "AT manyoso@users.noreply.github.com", in ["Adam Treat treat.adam@gmail.com", "Jared Van Bortel jared@nomic.ai"].
Commit sha: 881ac19, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: 2230628, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: 0db1651, Author: AT, Committer: cgivre; Expected "AT manyoso@users.noreply.github.com", but got "Adam Treat treat.adam@gmail.com".
Commit sha: f8b65c5, Author: AT, Committer: cgivre; Can not find "AT manyoso@users.noreply.github.com", in ["Adam Treat treat.adam@gmail.com", "Jared Van Bortel jared@nomic.ai"].
Commit sha: 668214a, Author: cgivre, Committer: cgivre; The sign-off is missing.
Commit sha: 8ffac8f, Author: Jared Van Bortel, Committer: cgivre; The sign-off is missing.
Commit sha: 919b415, Author: Jared Van Bortel, Committer: cgivre; Expected "Jared Van Bortel jared@nomic.ai", but got "AT manyoso@users.noreply.github.com".
Commit sha: 6499f27, Author: Max Cembalest, Committer: cgivre; Expected "Max Cembalest 70534565+mcembalest@users.noreply.github.com", but got "Max Cembalest mbcembalest@gmail.com".
Commit sha: 5b8bd22, Author: Max Cembalest, Committer: cgivre; The sign-off is missing.
Commit sha: f325cea, Author: Riccardo Giovanetti, Committer: cgivre; Can not find "Riccardo Giovanetti 29801031+Harvester62@users.noreply.github.com", in ["Riccardo Giovanetti riccardo.giovanetti@gmail.com", "Jared Van Bortel jared@nomic.ai"].
Commit sha: db36e30, Author: Riccardo Giovanetti, Committer: cgivre; Expected "Riccardo Giovanetti 29801031+Harvester62@users.noreply.github.com", but got "Riccardo Giovanetti riccardo.giovanetti@gmail.com".