git-mediate – become a conflict resolution hero | Heykuki News