git use problems and solutions