Skip to content

fix merge conflict

fd3dee8
Select commit
Loading
Failed to load commit list.
Open

export part - skip or throw on pending mutations and patch parts #1294

fix merge conflict
fd3dee8
Select commit
Loading
Failed to load commit list.
DCO-2 / DCO required action Jan 19, 2026 in 1s

Check failed

There are 11 commits incorrectly signed off, the check did not pass.

Summary


Sha Message Pass or fail reason
🔴 28e1246 export part - skip or throw on pending mutations a... Sign-off not found
🔴 dd10dda export partition as well Sign-off not found
🔴 506a8ab add more tests and remove unneeded change Sign-off not found
🔴 8254d0b add tests and add settings history Sign-off not found
🔴 87bf725 simplify things Sign-off not found
🔴 d4f1609 add docs for new settings Sign-off not found
🔴 4c59e82 remove unsupported setting from partition export d... Sign-off not found
🔴 d1d1f86 fix test glitch Sign-off not found
🔴 8eaadcf fix docs Sign-off not found
🔴 3ee9ce3 reorder boolean expression Sign-off not found
🟢 6b6be9e Merge branch 'antalya-25.8' into handle_pending_mu... Skipped: sign-off not required in merge commit
🔴 fd3dee8 fix merge conflict Sign-off not found

Errors details

Sign-off not found

No sign-off was found in the commit message. This usually means that the author or committer of this commit failed to include a Signed-off-by line in the commit message. In some cases, this error can also be raised if the sign-off is not in the correct format.

To avoid having pull requests blocked in the future, always include a Signed-off-by: User1 <user1@email.test> line in every commit message. You can also do this automatically by using the -s flag (i.e., git commit -s).

How to fix missing or invalid sign-offs

Option 1: add remediation commit

Option 2: fix commits without sign-off

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").

Warning

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

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 handle_pending_mutations_and_patch_parts