Welcome to Software Development on Codidact!
Will you help us build our independent community of developers helping developers? We're small and trying to grow. We welcome questions about all aspects of software development, from design to code to QA and more. Got questions? Got answers? Got code you'd like someone to review? Please join us.
Post History
The ideal way is to separate the upstreamable and non-upstreamable changes. For example you could maintain two branches: public and private. All upstreamable changes are cherry picked to public an...
Answer
#1: Initial revision
The ideal way is to separate the upstreamable and non-upstreamable changes. For example you could maintain two branches: `public` and `private`. All upstreamable changes are cherry picked to public and this is what you send back to the upstream. All your non-upstreamable changes would be in private.