Resolving git “pseudo conflicts” | Hacker News Reader