| Thread Previous • Date Previous • Date Next • Thread Next |
Linas,
1) Staging should be rebased on main, regularly (e.g. daily)
This makes sense once there's a policy for code making it directly into main (e.g., bug fixes). Right now, the policy is one-way, so I don't really see the point.
I wrote code that I placed into the main branch. The fact that its not in the staging branch tells me that no one is rebasing staging on main.
That's because commits should go to staging, not to main.
I am concerned that main and staging are drifting apart, and that there will be large changes between these two, and that they will be hard to reconcile.
Yes, I think we all anticipate one very large, probably painful merge. Hopefully it will be the only one because after that staging will feed main more frequently and granularly.
I believe one can create a patch for that code, and the developer who wrote it can then merge it with staging and fix incompatibilities.Yes, but whomever is contributing to staging has a duty to make sure that they are in sync with main, which is what seems to not be happening.
That's not in the current policy. I'm not opposed to changing the policy, but under the current policy you should only commit to staging, and Gama should be the only one who commits to main when merging from staging or possibly for bug fixes, should we change the policy to cover that.
Cassio
| Thread Previous • Date Previous • Date Next • Thread Next |
