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