Using a development branch

7 views
Skip to first unread message

Fraser Scott

unread,
Jul 14, 2015, 10:08:26 AM7/14/15
to pki...@googlegroups.com
Hi all,

I'm going to start using a development branch in the main repos (admin, core etc). I'd written the ca importing stuff that was going to be in 0.2.0, slowly heading towards Release 2. However, at some point I merged it into master and then merged some bug fixes on top, so that got released as 0.1.2 including the ca imports.

Instead, we can have a development branch that we merge all minor changes into, then merge development into master at the point of release. Patch changes (bug fixes) can either go straight onto master or possibly a patch branch that is then merged into master.

Athanasios Kostopoulos

unread,
Jul 14, 2015, 11:44:59 AM7/14/15
to Fraser Scott, pki...@googlegroups.com
How is this going to be reflected in the CI?

--
You received this message because you are subscribed to the Google Groups "pki.io" group.
To unsubscribe from this group and stop receiving emails from it, send an email to pki_io+un...@googlegroups.com.
To post to this group, send email to pki...@googlegroups.com.
Visit this group at http://groups.google.com/group/pki_io.
To view this discussion on the web, visit https://groups.google.com/d/msgid/pki_io/d716ca23-5a63-407f-937c-b6edbc14b011%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Fraser Scott

unread,
Jul 15, 2015, 5:17:59 AM7/15/15
to pki...@googlegroups.com, athanasios...@gmail.com, fraser...@gmail.com
On Tuesday, 14 July 2015 16:44:59 UTC+1, athanasioskostopoulos wrote:
How is this going to be reflected in the CI?

CI as in Travis? Not sure I know what you're asking. 

Athanasios Kostopoulos

unread,
Jul 18, 2015, 4:33:18 AM7/18/15
to Fraser Scott, pki...@googlegroups.com

Yes I mean travis

... sent from mobile

--
You received this message because you are subscribed to the Google Groups "pki.io" group.
To unsubscribe from this group and stop receiving emails from it, send an email to pki_io+un...@googlegroups.com.
To post to this group, send email to pki...@googlegroups.com.
Visit this group at http://groups.google.com/group/pki_io.
Reply all
Reply to author
Forward
0 new messages