I just let claude do all conflict resolution for me. code conflicts are a solved problem.
guytv
Entrepreneur, Software engineer, Product designer, Long walks, Bicycles, Arabic, Meditation.
Posts71
Comments168
Entrepreneur, Software engineer, Product designer, Long walks, Bicycles, Arabic, Meditation.