I'm creating a webframework hosted on a public Github repository.
The same framework is hosted on a server with some customization.
So how can I manage those two states developement and production?
My current approach is pretty expensive: On the Server I pull the code from the repo, get merge conflicts because of the customization, have to merge it, and sometimes have to add my customization again.
I don't want my customization to be public, so a different branch for production is no option.