Skip to content

docs: add merge failure and recovery docs - #10080

Open
ajtmccarty wants to merge 3 commits into
release-1.11from
merge-failure-recovery-docs
Open

docs: add merge failure and recovery docs#10080
ajtmccarty wants to merge 3 commits into
release-1.11from
merge-failure-recovery-docs

Conversation

@ajtmccarty

@ajtmccarty ajtmccarty commented Jul 29, 2026

Copy link
Copy Markdown
Contributor
  • update error message to list the correct command
  • add infrahub recover to the CLI reference
  • add a merge failure and recovery section to the user-facing merge docs

Review in cubic

@github-actions github-actions Bot added type/documentation Improvements or additions to documentation group/backend Issue related to the backend (API Server, Git Agent) labels Jul 29, 2026

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 8 files

Confidence score: 5/5

  • Automated review surfaced no issues in the provided summaries.
  • No files require special attention.

Shadow auto-approve: would auto-approve. PR updates error messages to the correct CLI command and adds user-facing merge failure/recovery docs plus CLI reference page. Change is purely documentation and string fixes; no behavioral, operational, or security impact.

Re-trigger cubic

@codspeed-hq

codspeed-hq Bot commented Jul 29, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 12 untouched benchmarks


Comparing merge-failure-recovery-docs (1e92bf7) with release-1.11 (264d3ab)

Open in CodSpeed

@ajtmccarty
ajtmccarty marked this pull request as ready for review July 30, 2026 17:49
@ajtmccarty
ajtmccarty requested review from a team as code owners July 30, 2026 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

group/backend Issue related to the backend (API Server, Git Agent) type/documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants