Hacker News new | ask | show | jobs
by bwat49 61 days ago
no merging, they just show as sync conflicts