gastown/polecats/rictus 24d5231661 Implement git merge logic in Engineer.ProcessMR (gt-pnv61) ...

Adds actual git merge functionality to ProcessMR and ProcessMRFromQueue:
- Fetch source branch from origin
- Checkout target branch and pull latest
- Check for merge conflicts using test merge
- Run configured tests with retry support
- Perform --no-ff merge with descriptive message
- Push to origin
- Return detailed ProcessResult with success/conflict/test status

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

2025-12-30 22:43:15 -08:00

..

engineer_test.go

Remove stubbed ProcessMRFromQueue and mrqueue package (gt-u4fh)

2025-12-30 00:59:29 -08:00

engineer.go

Implement git merge logic in Engineer.ProcessMR (gt-pnv61)

2025-12-30 22:43:15 -08:00

manager_test.go

Implement three-tier config architecture (gt-k1lr tasks 1-5)

2025-12-22 01:22:43 -08:00

manager.go

ZFC #5: Move merge/conflict decisions from Go to Refinery agent

2025-12-30 02:12:43 -08:00

types_test.go

…

types.go

Remove stats from .runtime/*.json observable state (gt-lfi2d)

2025-12-30 02:05:54 -08:00