Hi, In my setup, I have sample files that I get from git pulling a regularly updated GitHub repository as well as "real files" (that are adapted from sample files to my environment but that are not tracked by the GitHub repo).
Basically, when I do a "git pull" from GitHub repo, the sample files might change and if so, I want to apply these changes to my "real" files too. So what I thought is that I could do a "git merge-file" between the old sample file and new sample file and apply it to the old real file to get the new real file. Is it possible to call git merge-file on 2 different revisions of the same file (because in my setup, I would commit the changes on the sample files before doing this operation) and my old real file? I hope this makes sense... Cheers, Mathieu -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
