In the current world when they are done with a release they have to reconcile their internal trunk (main branch) to the external trunk which is the one that everyone can see. This is because currently google do some development internally while other development is done on the public trunk. This reconciliation process can be annoying due to things like “merge conflicts” (ie. A disagreement between two versions of changes about what the final change should be). By doing all work on the internal trunk it should make this reconciliation process much simpler.
idunnololz@lemmy.world 1 day ago
In the current world when they are done with a release they have to reconcile their internal trunk (main branch) to the external trunk which is the one that everyone can see. This is because currently google do some development internally while other development is done on the public trunk. This reconciliation process can be annoying due to things like “merge conflicts” (ie. A disagreement between two versions of changes about what the final change should be). By doing all work on the internal trunk it should make this reconciliation process much simpler.