Fix silent comit for the rebasebot.

[mpryc]

This requires a rebasebot to support new flag:

--conflict-policy strict

Requires PR: openshift-eng/rebasebot#78

Summary by CodeRabbit

• Chores
  • Enhanced rebase automation with stricter conflict handling policy during merge operations.

[mpryc]

/hold

[kaovilai]

@coderabbitai full review

[kaovilai]

@coderabbitai full review

[coderabbitai]

✅ Actions performed

Full review triggered.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

---

📝 Walkthrough

Walkthrough

A new command-line argument --conflict-policy strict is added to the rebasebot CLI invocations in both the run_local_rebase and run_container_rebase functions within the shell script, with line continuations adjusted accordingly.

Changes

Cohort / File(s)	Summary
Rebase Script Configuration run-oadp-rebase.sh	Added --conflict-policy strict argument to rebasebot CLI calls in local and container rebase functions.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Poem

🐰 With whiskers twitch and hoppy cheer,
A policy strict brings peace most dear,
No conflicts clash in rebase's dance,
One simple flag grants harmony's chance! ✨

🚥 Pre-merge checks | ✅ 1 | ❌ 2

❌ Failed checks (1 warning, 1 inconclusive)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.
Title check	❓ Inconclusive	The title 'Fix silent comit for the rebasebot' is vague and contains a typo ('comit' instead of 'commit'), making it unclear what the actual change accomplishes.	Clarify the title to accurately describe the change (e.g., 'Add --conflict-policy strict flag to rebasebot CLI invocation') and fix the typo.

✅ Passed checks (1 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

• 📝 Generate docstrings

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch rebasebot-fix-silent-commit

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}