Generate and Apply Patch
Learn what to do when a cherry-pick fails.
We'll cover the following...
Generate patch
So far you’ve seen that the cherry-pick didn’t do what you wanted, and you’ve seen why. Now you’re going to use a different technique to achieve what you want.
First, revert the cherry-pick you started:
1 git cherry-pick --abort
Now, you’re going to do two things:
- Create a patch file that has the diff contained in the
abranchtag
commit within it. - Apply that diff to the
master
branch.
Patch files were originally created to pass changes round by email. The git
...