Skip to content

fix: handle negated pull request conflict guidance#119

Merged
CoderDeltaLAN merged 1 commit into
mainfrom
fix/conflicts-block-polarity-negation
Jun 20, 2026
Merged

fix: handle negated pull request conflict guidance#119
CoderDeltaLAN merged 1 commit into
mainfrom
fix/conflicts-block-polarity-negation

Conversation

@CoderDeltaLAN

Copy link
Copy Markdown
Owner

Summary:

  • Fix conflict detection so negated pull request guidance is not treated as a pull request requirement.

Scope:

  • Updates deterministic conflict matching for negated PR boundary wording.
  • Adds regression coverage for negated PR guidance.
  • Updates CHANGELOG under Unreleased.

Validation:

  • python -m unittest tests.test_conflicts: passed.
  • ./scripts/check.sh: passed.
  • ./scripts/post-release-audit.sh from clean tree: passed.
  • Pre-push diff limited to CHANGELOG.md, src/agent_rules_kit/conflicts.py, and tests/test_conflicts.py.

Risk:

  • Low. Localized deterministic regex/polarity change with targeted regression tests.

Rollback:

  • Revert the PR commit.

@CoderDeltaLAN CoderDeltaLAN merged commit 34b5f33 into main Jun 20, 2026
4 checks passed
@CoderDeltaLAN CoderDeltaLAN deleted the fix/conflicts-block-polarity-negation branch June 20, 2026 05:04
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