Git Rerere Cheat Sheet

# 1. Enable Rerere globally
git config --global rerere.enabled true
git config --global rerere.autoupdate true

# 2. Check active conflict resolution state
git rerere status
git rerere diff

# 3. Undo/Forget an incorrect resolution
git rerere forget <path/to/file>
git checkout --conflict=zdiff3 <path/to/file>

# 4. Clean up stale/abandoned recordings
git rerere gc
git rerere clear

# 5. Backup or export cache across CI runners
tar -czf rr-cache.tar.gz -C .git rr-cache
tar -xzf rr-cache.tar.gz -C .git/