Skip to content

refactor!: remove conflict.enabled - #478

Merged
barrettruth merged 3 commits into
devfrom
refactor/remove-conflict-enabled
Nov 8, 2026
Merged

barrettruth merged 3 commits into
devfrom
refactor/remove-conflict-enabled

Conversation

@barrettruth

@barrettruth barrettruth commented Nov 8, 2026 •

Copy link
Copy Markdown
Owner

Remove all handling of conflict.enabled, including its warning and type annotation. Document conflict = false directly.

Base automatically changed from fix/deprecate-conflict-enabled to main November 8, 2026 21:09
@barrettruth barrettruth closed this Nov 8, 2026
@barrettruth
barrettruth deleted the refactor/remove-conflict-enabled branch November 8, 2026 22:12
@barrettruth
barrettruth restored the refactor/remove-conflict-enabled branch November 8, 2026 22:20
@barrettruth barrettruth reopened this Nov 8, 2026
@barrettruth barrettruth changed the title (DO NOT MERGE UNTIL 30/11/2026) refactor!: remove conflict.enabled refactor!: remove conflict.enabled Nov 8, 2026
@barrettruth
barrettruth changed the base branch from main to dev November 8, 2026 23:56
@barrettruth
barrettruth merged commit eac3ae8 into dev Nov 8, 2026
0 of 3 checks passed
@barrettruth
barrettruth deleted the refactor/remove-conflict-enabled branch November 8, 2026 23:59
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