Git Conflict resolution made simple Post date July 3, 2021 Post author By José Muñoz Post categories In git, lifehack, productivity