**Title:** DCO Fix Blocked by `go.mod` Merge Conflict During Rebase

Community
, ,
1

PR: #19509 — fix(ui/e2e): revive weak specs from #19476

Problem

Three commits in my PR are missing Signed-off-by trailers, causing the DCO check to fail:

  • 3c763c8 — fix(e2e): remove duplicate relationship count assertion
  • a475458 — fix(e2e): skip designs suite until DesignPage.navigateTo() is stable
  • 41cbd8a — fix(e2e): skip designs suite until DesignPage.navigateTo() is stable

Approaches Tried

  1. git rebase -i HEAD~5 — resulted in a go.mod + go.sum merge conflict on an unrelated upstream commit (chore: bump GitHub - meshery/schemas: Logical object models for Meshery · GitHub to v1.2.20), blocking the rebase
  2. git rebase HEAD~5 --signoff — same go.mod conflict
  3. git filter-branch -f --msg-filter — rewrote all 270 commits in history, causing 278 commits to appear in the PR with massive conflicts. Reverted using git reset --hard + force push.

The branch is now restored to its original clean state, but the DCO check is still failing on those 3 commits.

Question

What is the safest way to add Signed-off-by trailers to specific commits when git rebase is blocked by upstream go.mod conflicts?

Any guidance would be greatly appreciated!