Solving a problem with Git