-
Notifications
You must be signed in to change notification settings - Fork 0
Repository Organisation
Generali is not pushing in the branches coming from the Upstream (especially not master). Instead we use branches prefixed with generali for our changes. We have one main integration branch "generaliIntegration" where we integrate feature branches. The generaliIntegration branch reflects our current development status. We try to develop features in disjunct feature branches based on the master (current development status of the Upstream) to enable simple Pull Requests to the master. Sometimes this might not be possible and we would develop a feature branch based on our generaliIntegration branch then.
If our Pull Requests are accepted by the Upstream, we will pull them again in the Upstreams branches in our fork and aim to merge back in our generaliIntegration branch.
Let's see how this works ;-)
We try to keep changes we feel we need to make due to legal reasons out of the codebase and document them here in the wiki. The goal of this is to keep changes in the codebase to a minimum for everything not being a new feature, a bugfix, a documentation improvment etc.