Skip to content

Merge main into staging/hi_itn_v3 to resolve conflicts for #498 - #503

Closed
mayuris-00 wants to merge 3 commits into
NVIDIA:staging/hi_itn_v3from
mayuris-00:hi-itn-v3-resolve-conflicts
Closed

mayuris-00 wants to merge 3 commits into
NVIDIA:staging/hi_itn_v3from
mayuris-00:hi-itn-v3-resolve-conflicts

hi_en ITN: remove .strip() from address test assertions

85ce5ed
Select commit
Loading
Failed to load commit list.
DCO / DCO required action Sep 29, 2026 in 1s

DCO

There are 3 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~9 --signoff
  3. Force push your changes to overwrite the branch: git push --force-with-lease origin hi-itn-v3-resolve-conflicts

Summary

Commit sha: c8ad73e, Author: Mariana, Committer: GitHub; Can not find "Mariana 47233618+mgrafu@users.noreply.github.com", in ["Mariana Graterol Fuenmayor marianag@nvidia.com", "Mariana Graterol Fuenmayor marianag@nvidia.com", "Mariana Graterol Fuenmayor marianag@nvidia.com"].
Commit sha: 1f12635, Author: Mariana, Committer: GitHub; Can not find "Mariana 47233618+mgrafu@users.noreply.github.com", in ["Mariana Graterol Fuenmayor marianag@nvidia.com", "Mariana Graterol Fuenmayor marianag@nvidia.com", "Mariana Graterol Fuenmayor marianag@nvidia.com"].
Commit sha: acacc21, Author: tbartley94, Committer: GitHub; Can not find "tbartley94 tbartley@nvidia.com", in ["Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Jinwoo Bae bbae7050@gmail.com", "Mariana 47233618+mgrafu@users.noreply.github.com"].