Skip to content

Commit 34e412b

Browse files
justin808claude
andcommitted
Replace manual file commands with automated rake/yarn scripts
Update formatting documentation to use proper automated commands: - Use `rake autofix` instead of manual `npx prettier --write <files>` - Use `yarn start format.listDifferent` for checking - Use `git add .` instead of manual file listing - Emphasize automated workflow over manual file management This makes the process much more reliable and less error-prone. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
1 parent 7d385a1 commit 34e412b

File tree

3 files changed

+18
-19
lines changed

3 files changed

+18
-19
lines changed

CLAUDE.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,24 @@ These requirements are non-negotiable. CI will fail if not followed.
4040

4141
### Standard Workflow
4242
1. Make code changes
43-
2. Run `npx prettier --write <files>` or `rake autofix`
43+
2. Run `rake autofix` or `yarn start format`
4444
3. Commit changes
4545

4646
### Merge Conflict Resolution Workflow
4747
**CRITICAL**: When resolving merge conflicts, follow this exact sequence:
4848

4949
1. **Resolve logical conflicts only** - don't worry about formatting
50-
2. **Add resolved files**: `git add <conflicted-files>`
51-
3. **Let Prettier format**: `npx prettier --write <conflicted-files>`
52-
4. **Add formatted files**: `git add <conflicted-files>` (if Prettier made changes)
50+
2. **Add resolved files**: `git add .` (or specific files)
51+
3. **Auto-fix everything**: `rake autofix`
52+
4. **Add any formatting changes**: `git add .`
5353
5. **Continue rebase/merge**: `git rebase --continue` or `git commit`
5454

5555
**❌ NEVER manually format during conflict resolution** - this causes formatting wars between tools.
5656

5757
### Debugging Formatting Issues
58-
- Check current formatting: `npx prettier --check .`
59-
- Fix all formatting: `npx prettier --write .`
60-
- If CI fails on formatting, always run Prettier, never manual fixes
58+
- Check current formatting: `yarn start format.listDifferent`
59+
- Fix all formatting: `rake autofix`
60+
- If CI fails on formatting, always run automated fixes, never manual fixes
6161

6262
### Development Setup Commands
6363

docs/contributor-info/coding-agents-guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,9 @@ git checkout HEAD~1 -- Gemfile package.json # Rollback versions
356356

357357
**Merge conflict resolution workflow:**
358358
1. Resolve logical conflicts only (ignore formatting)
359-
2. `git add <resolved-files>`
360-
3. `npx prettier --write <resolved-files>`
361-
4. `git add <resolved-files>` (if Prettier made changes)
359+
2. `git add .` (or specific files)
360+
3. `rake autofix` (fixes all formatting + linting)
361+
4. `git add .` (if autofix made changes)
362362
5. Continue rebase: `git rebase --continue`
363363

364364
**Never manually format during conflict resolution** - this causes formatting wars.

docs/contributor-info/linters.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,23 @@ Autofixing is a **HUGE** time saver!
3737

3838
```bash
3939
# Check formatting
40-
npx prettier --check .
40+
yarn start format.listDifferent
4141

42-
# Fix formatting
43-
npx prettier --write .
44-
45-
# Or use project scripts
42+
# Fix formatting (includes all linters)
4643
rake autofix
47-
yarn start format.listDifferent # check only
44+
45+
# Or format only
46+
yarn start format
4847
```
4948

5049
### Merge Conflict Resolution
5150

5251
When resolving merge conflicts, **NEVER manually format**. Follow this sequence:
5352

5453
1. Resolve logical conflicts only
55-
2. `git add <resolved-files>`
56-
3. `npx prettier --write <resolved-files>`
57-
4. `git add <resolved-files>` (if Prettier made changes)
54+
2. `git add .` (or specific files)
55+
3. `rake autofix` (fixes all formatting + linting)
56+
4. `git add .` (if autofix made changes)
5857
5. Continue with `git rebase --continue` or `git commit`
5958

6059
**Why this matters**: Manual formatting during conflict resolution creates "formatting wars" between tools and leads to back-and-forth formatting changes in PRs.

0 commit comments

Comments
 (0)