COmanage Developers List

[Scott Koranda <>]

Hi,

On Sun, Feb 9, 2014 at 3:49 PM, Benn Oshrin 
<>
 wrote:
> I've just pushed my first commit to develop. This brings up the question of
> how we specifically want to move things from develop to master.
>
> The spectrum seems to be
>
> /\ As soon as the commit to develop takes place
> || After folks have pulled the commit and used that code for some time
> \/ Right before tagging the release

I think "Right before tagging the release" would work best for us.

>
> The earliest option seems like the least valid one, otherwise what's the
> point of the develop branch?
>
> If we go with the other two, how do we track commits waiting to be merged
> into master? Just using github? With a JIRA workflow?
>
> BTW, I've started this page in the wiki:
>
>  https://spaces.internet2.edu/display/COmanage/Branch+Management
>

Git can tell you which commits are in develop that have not been moved
to master:

git log develop ^master --no-merges

You can also find graphical tools that will show you a nice graphical
representation.

The github graphical tool also shows you.

Thanks,

Scott