Hacker News new | ask | show | jobs
by guytv 87 days ago
I just let claude do all conflict resolution for me. code conflicts are a solved problem.