4 ms·Show HN: Fix All Conflicts – command line app for fixing merge conflicts10 points by mkchoi212 9y agotopher200 9y agoDiscussion here: https://news.ycombinator.com/item?id=16056271 https://news.ycombinator.com/item?id=16056271