Merging GitHub 2.0 branch into dev

Hey all,

In order to be more consistent with git flow and reduce developer confusion, we are planning on merging the 2.0 branch on GitHub into the dev branch. From that point on, all development work should work off of dev for 2.0 and future releases. The 2.0 branch will be deleted and the Jenkins CI server will stop building off 2.0 and start building off dev. This should be done in the next few days.

Please reply if you have any feedback.

Shalom,

Chongsun

– ​

There are 10 kinds of people in this world; those who understand binary, and those who don’t.

Chongsun Ahn | chongsun.ahn@villagereach.org

Software Development Engineer

Village****Reach* ** Starting at the Last Mile*

2900 Eastlake Ave. E, Suite 230, Seattle, WA 98102, USA

DIRECT: 1.206.512.1536 **CELL: **1.206.910.0973 FAX: 1.206.860.6972

SKYPE: chongsun.ahn.vr

www.villagereach.org

Connect on Facebook****, Twitter** ** and our Blog

Thanks Chongsun for merging 2.0 into dev. Per the 1/26tech committee meeting, as well as confirmation from Danni, looks like we are all in agreement on deleting the branch named “2.0”.

···

On Friday, January 22, 2016 at 10:50:05 AM UTC-8, chongsun.ahn wrote:

Hey all,

In order to be more consistent with git flow and reduce developer confusion, we are planning on merging the 2.0 branch on GitHub into the dev branch. From that point on, all development work should work off of dev for 2.0 and future releases. The 2.0 branch will be deleted and the Jenkins CI server will stop building off 2.0 and start building off dev. This should be done in the next few days.

Please reply if you have any feedback.

Shalom,

Chongsun

– ​

There are 10 kinds of people in this world; those who understand binary, and those who don’t.

Chongsun Ahn | chongsun.ahn@villagereach.org

Software Development Engineer

Village****Reach* ** Starting at the Last Mile*

2900 Eastlake Ave. E, Suite 230, Seattle, WA 98102, USA

DIRECT: 1.206.512.1536 **CELL: **1.206.910.0973 FAX: 1.206.860.6972

SKYPE: chongsun.ahn.vr

www.villagereach.org

Connect on Facebook****, Twitter** ** and our Blog

While we’re cleaning up branches, does it make sense to retain 2.0-TZ and 2.0-merge?

There’s a few other old branches that seem like good candidates for removal - list is below. If you have any input on keeping/deleting any one of these, please reply.

  • demo (I think this was from an earlier Soldevelo project for SELV)
  • dist_refactoring
  • gh-pages
  • rnr-heap-optimization