mirror of
https://github.com/oxc-project/oxc.git
synced 2026-11-04 10:29:58 +00:00
connorshea
8166f80b41
- The header on rules_enum.rs was being stripped by accident, which was confusing for users. So I fixed that. - Mark the generated files as generated in `.gitattributes`, for GitHub to understand the diffs are mostly pointless and can be collapsed by default (the CI job enforces that these files be up to date anyway). - Mark the generated rule files as `merge=ours`. See https://git-scm.com/book/ms/v2/Customizing-Git-Git-Attributes for more info on what that means, but it should make the merge conflicts less problematic. - Updated `just ready` to include the lintgen command. - Added `cargo lintgen` to the AGENTS.md file. AI Disclosure: Used Claude to find the reason for the lack of header comment because I had no idea why it was happening.
11 lines
581 B
Plaintext
11 lines
581 B
Plaintext
crates/oxc_formatter/tests/fixtures/** text=auto eol=lf
|
|
crates/oxc_formatter/tests/fixtures/js/crlf text=auto eol=crlf
|
|
apps/oxfmt/test/**/fixtures/** text=auto eol=lf
|
|
apps/oxlint/test/fixtures/** text=auto eol=lf
|
|
|
|
# Use 'ours' merge strategy to avoid conflicts.
|
|
# After merging, run `cargo lintgen` to regenerate with the combined rules.
|
|
crates/oxc_linter/src/generated/rules_enum.rs linguist-generated=true merge=ours
|
|
crates/oxc_linter/src/generated/rule_runner_impls.rs linguist-generated=true merge=ours
|
|
crates/oxc_linter/src/generated/assert_layouts.rs linguist-generated=true
|