R remergr.io Resolve your conflicts directly from GitHub's UI 3 points mfocaraccio 10 years ago 1 comments