Show HN: Resolve Git Conflicts Automaticallyfdietze.github.io7 points·manx··0 commentsOpen articleSaveView on HN