New GitHub App automates resolving merge conflicts (JavaScript only)blogs.grammatech.com4 points·eschulte··1 commentOpen articleSaveView on HN