3 ms·I just let claude do all conflict resolution for me. code conflicts are a solved problem.by guytv 7mo agoI just let claude do all conflict resolution for me. code conflicts are a solved problem.