Flummoxed by IT: Git: Applying changes from one file to another file