Show HN: Fix All Conflicts – command line app for fixing merge conflictsgithub.com·10 pts·mkchoi212·1