Frappe framework source control issue

I am currently working with Frappe in my local environment for a specific customization requirement. Now, when it comes to making a pull request, I want to keep the customized changes for one repository intact, while simultaneously incorporating the latest version of ERPNext from another repository. I’m wondering how I can achieve this combination of preserving my custom changes and updating to the most recent version of ERPNext.


You can watch this video for the process: Creating a custom app and installing it on your instance | Frappe Developer Training - Day Three - YouTube