Question

I have two branches: trunk, production. I have found a problem in trunk, made fix and committed it, pushed it. Now it was tested and I need do merge changes into the production branch as a hot-fix. I try to use the cherry-pick. However it doesn’t work because a changed file(s) in the fix was renamed in the trunk earlier during some refactoring which I don’t want bring into production.

I don’t want merge everything, but take only this commit. The cherry pick fails with “deleted by us” conflict (of course, the new file never even existed in the production branch).

What is the correct way to bring the changes into the old file?

Answer 1

I’d use good old patch for this:

git show COMMIT_ID -- old/file/name.txt | patch new/file/name.txt