Solving git-differences