...
| Code Block |
|---|
patch -p0 < cool_patch.patch
|
If you prefer to use git to apply the patch, the following patches the tree and runs git add on them ( this is very usefull, since it will not miss added/renamed files; and also enables git to oversee the conflicts...so git mergetool can be used to resolve the conflicts)
| Code Block |
|---|
git apply -3 -p0 HIVE-1111.1.patch |
If you just want to check whether the patch applies you can run patch with --dry-run option:
...