paul
f7c0e5f51a
- Added pre-fetch and check before committing to ensure we're up-to-date - Improved retry logic with clearer output and better error handling - Added explicit fetch before each retry attempt - Use for-loop instead of while for clearer retry counting - Better fallback from rebase to merge on conflicts - Added set -e to fail fast on errors - More verbose logging for debugging This should resolve the persistent "non-fast-forward" errors by: 1. Checking if we're behind before even committing 2. Pulling changes if needed 3. Retrying with proper synchronization 4. Providing clear debug output 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>