G gitbook.com Show HN: GitBook Editor – Merge Conflict Resolution UI 8 points friendcode 10 years ago 5 comments