Hacker News new | ask | show | jobs
by JoshTriplett 4171 days ago
It gets even uglier when you don't discover those conflicts until a pull or push.