Hacker News new | ask | show | jobs
by feelamee 71 days ago
sure, but solving conflicts is still hard in git. This can be simplified.