Stopping merges from BitBucket to GitHub

Hi everyone,

At a recent tech committee call, we talked about ceasing the automatic merging from eLMIS (BitBucket) to the 2.0 branch (GitHub). At this point, it seems neither project has any real dependency on the other*. Furthermore, we need to stop the automatic merging so we can finish the 2.0 release tag effort and treat the branch as a true master branch.

ThoughtWorks has graciously been performing the merge from eLMIS to 2.0. I propose (as Danni did weeks ago!) to stop this merge, today. Any objections?

(*As discussed in a different thread, VIMS should do at least one merge from 2.0 to get the stock-management module changes. And, of course, VIMS can continue pulling whatever is needed from the 2.0 branch)

As mentioned, we’re working towards a 2.0 release tag. A big part of this effort is to adopt coding standards and a contribution guide to provide guiderails for how code makes its way into the branch. Josh will put out the first draft soon.

Thanks – Rich

Hi Happy post-holiday everyone!

It’s important to get a release tag for 2.0 and start using it as the new master branch, and we’re okay to stop the merge. On a side note, I’ve just reverted some changes I made to 2.0 today (blame me for not having read all my emails first thing after holiday…) and you can ignore them.

Karl is right - we run the risk of codebases diverging significantly and merging in the future becomes difficult to manage. My understanding is that teams will contribute core / common functionalities to 2.0 (based on the guidelines) and the branches will become respectively a Moz implementation of 2.0 and a TZ implementation of 2.0 and there shouldn’t be a need to merge them again - Rich, Josh and Jeff, please correct me if this is wrong.

Looking forward to the guidelines draft - thank you!

-Danni

···

On Wed, Dec 23, 2015 at 7:19 AM, Karl Brown kabrown@thoughtworks.com wrote:

If Danni is ok with it, and you guys don’t see any risk wrt the code bases diverging significantly, that sounds ok to me.

On Dec 22, 2015, at 17:31, Rich Magnuson rich.magnuson@villagereach.org wrote:

Hi everyone,

At a recent tech committee call, we talked about ceasing the automatic merging from eLMIS (BitBucket) to the 2.0 branch (GitHub). At this point, it seems neither project has any real dependency on the other*. Furthermore, we need to stop the automatic merging so we can finish the 2.0 release tag effort and treat the branch as a true master branch.

ThoughtWorks has graciously been performing the merge from eLMIS to 2.0. I propose (as Danni did weeks ago!) to stop this merge, today. Any objections?

(*As discussed in a different thread, VIMS should do at least one merge from 2.0 to get the stock-management module changes. And, of course, VIMS can continue pulling whatever is needed from the 2.0 branch)

As mentioned, we’re working towards a 2.0 release tag. A big part of this effort is to adopt coding standards and a contribution guide to provide guiderails for how code makes its way into the branch. Josh will put out the first draft soon.

Thanks – Rich

Cc: OpenLMIS Product and Governance committee DLs