Show HN: Fix All Conflicts – command line app for fixing merge conflictsgithub.com10 points·mkchoi212··1 commentOpen articleSaveView on HN