Hacker News new | ask | show | jobs
by tasuki 1440 days ago
Yes, better conflict resolution is needed, but outside of scope for git. Do one thing well.