Closed takinbo closed 6 years ago
What is generally considered best practice? It would be release branches, not repos, right?
On Sat, Oct 13, 2018 at 11:29 PM Tim Akinbo notifications@github.com wrote:
We're coming up against an issue where the code for Apollo 2 and 3 have diverged. Putting up everything on one branch makes it difficult to manage changes.
We have two options:
- Maintain different release branches for both versions
- Split the project into two repositories and manage them independently
Any suggestions on what might be a better strategy for managing the project going forward?
@cdoten https://github.com/cdoten @stigsfoot https://github.com/stigsfoot @dodumosu https://github.com/dodumosu
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/nditech/dev-elections/issues/53, or mute the thread https://github.com/notifications/unsubscribe-auth/AAdD5Cord1P_NhQXycOz2c_kH7Nb6ifbks5ukq-igaJpZM4Xa8JV .
-- Chris Doten Chief Innovation Officer National Democratic Institute for International Affairs (NDI) cdoten@ndi.org | @cdoten https://twitter.com/cdoten | http://nditech.org | @nditech https://twitter.com/nditech
@takinbo Draft a new release organized by branches (where the master is the latest stable).
For more on this see https://help.github.com/articles/creating-releases/
@stigsfoot @dodumosu @cdoten I created a different branch called version2
that would be used to track changes for Apollo 2. In order to make changes specific to Apollo 2, please submit a PR against that branch. Also going forward, we would be creating releases for every major, minor and micro version alongside the changelog for that version.
We're coming up against an issue where the code for Apollo 2 and 3 have diverged. Putting up everything on one branch makes it difficult to manage changes.
We have two options:
Any suggestions on what might be a better strategy for managing the project going forward?
@cdoten @stigsfoot @dodumosu