--ours vs --theirs in git | Hacker News Reader