Automatic Git conflict resolution on logs and sets | Hacker News Reader