incubator-flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Carlos Rovira <carlos.rov...@codeoscopic.com>
Subject Re: Getting To Git (was Re: [MENTORS] Current Branching Strategy Vote Results)
Date Thu, 16 Aug 2012 09:05:39 GMT
Hi Justin,

So any changes I wanted to commit I'll need to commit to develop branch
> once it exists? How exactly is it decided that the branch should then be
> merged with trunk?
>

Please read the following article that is the the core of the development
model selected:
 nvie.com/posts/a-successful-git-branching-model

the branch "develop" should be the place to work and the one of wich we
could extract nightly builds because it should be stable over time (each
feature merged with develop should be stable making develop stable as well).

"trunk" will become "master" and this should bring us the releases (passing
for a release branch to prepare the release).

So the main work should take place in develop and master should bring work
from develop when  a release will scheduled (passing for a release branch
first)



-- 
Carlos Rovira
Director de Tecnología
M: +34 607 22 60 05
F:  +34 912 35 57 77
<http://www.codeoscopic.com>
CODEOSCOPIC S.A. <http://www.codeoscopic.com>
Avd. del General Perón, 32
Planta 10, Puertas P-Q
28020 Madrid

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message