Automatic Git conflict resolution on logs and setsa3nm.net1 point·relyio··1 commentOpen articleSaveView on HN