resolve any merge conflicts if there are any and commit those changes
4. Generate a patch:
git format-patch -1
That will give you a .patch file which you can then apply on your install directory where nova exists (you probably want to also delete those .pyo and .pyc files):
You can checkout whatever tag of code you're on (16.0.1):
1. git clone <url to nova repo>
2. git checkout 16.0.1
3. cherry pick jay's patch:
git fetch https:/ /git.openstack. org/openstack/ nova refs/changes/ 10/538310/ 2 && git cherry-pick -x FETCH_HEAD
resolve any merge conflicts if there are any and commit those changes
4. Generate a patch:
git format-patch -1
That will give you a .patch file which you can then apply on your install directory where nova exists (you probably want to also delete those .pyo and .pyc files):
https:/ /linuxacademy. com/blog/ linux/introduct ion-using- diff-and- patch/