Skip to content

fix: resolve merge conflict markers in pyproject.toml#41

Merged
Coding-Dev-Tools merged 1 commit into
mainfrom
fix/resolve-pyproject-conflict-markers
Jul 3, 2026
Merged

fix: resolve merge conflict markers in pyproject.toml#41
Coding-Dev-Tools merged 1 commit into
mainfrom
fix/resolve-pyproject-conflict-markers

Conversation

@Coding-Dev-Tools

Copy link
Copy Markdown
Owner

Summary

Remove leftover git conflict markers (<<<<<<< Updated upstream / ======= / >>>>>>> Stashed changes) and the duplicated content block from an unresolved stash merge in pyproject.toml.

Testing

CI will run test/coverage/security jobs on this branch.

Remove leftover git conflict markers (<<<<<<< Updated upstream /
======= / >>>>>>> Stashed changes) and the duplicated content
block from an unresolved stash merge.
@github-actions

github-actions Bot commented Jul 3, 2026

Copy link
Copy Markdown

🤖 Automated Code Review

✅ Ruff Lint — No issues

⚠️ Ruff Format — Formatting needed

Would reformat: src/api_contract_guardian/cli.py
Would reformat: src/api_contract_guardian/diff.py
Would reformat: src/api_contract_guardian/gate.py
Would reformat: src/api_contract_guardian/loader.py
Would reformat: src/api_contract_guardian/migration.py
Would reformat: tests/test_diff.py
Would reformat: tests/test_edge_cases.py
Would reformat: tests/test_gate.py
Would reformat: tests/test_migration.py
9 files would be reformatted, 6 files already formatted

✅ Secret Detection — Clean

✅ Large Files — Within limits

📊 Diff Stats — 3 file(s) changed

 .github/workflows/release-audit.yml |  64 +++
 pyproject.toml                      |  70 +---
 tests/test_cli.py                   | 816 +++++++++++++++++++++++++++++++-----
 3 files changed, 782 insertions(+), 168 deletions(-)

Verdict: ⚠️ Warnings — Lint/format issues found. Recommend fixing before merge.

Automated by Coding-Dev-Tools/.github reusable workflow.

@Coding-Dev-Tools Coding-Dev-Tools merged commit 65e87d9 into main Jul 3, 2026
5 checks passed
@Coding-Dev-Tools Coding-Dev-Tools deleted the fix/resolve-pyproject-conflict-markers branch July 3, 2026 22:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant