conflict-resolver

A tool to automatically resolve GitHub merge conflicts

Browse on unpkg