Lets suppose we have downloaded PHP source codes of some product (framework or CMS for example) of some vendor.
After examination of source code, it was found that some parts of it should be slightly (a change of 1-2 lines) modified in order to integrate properly with our application.
Is there any well-known technique for doing such modifications? Imagine, we've changed something and after that vendor releases a new version of its product and we should manually compare all files in order to transfer our modifications to the new version. Are there any ways to avoid such issues? Maybe there are some command-line tools, which can simplify it?
Just found What are some strategies to facilitate relatively heavy modification of vendor's code while preserving upgradability?
Answer of @Breton mentions using GIT and 2 separate branches. We can go with that, but maybe someone knows other ways to do that?
In our case modifications in vendor code are very small (1-2 lines) ...