← Back to team overview

fenics team mailing list archive

Re: Development model

 

So you mean it makes sense for each developer that has at least two
topic branches?

--
Anders


On Wed, Apr 17, 2013 at 02:15:32PM +0200, Martin Sandve Alnæs wrote:
>    Partly true, but from a personal workflow p.o.v. it still makes sense
>    to me:
>
>    - work in local mytopic
>    - keep local master in sync by pulling
>    - pull master into local next and merge mytopic into local next and
>    test before merging mytopic into master and pushing
>
>    If you have several local topic branches you can merge them into next
>    separately or together for testing, then later merge them one at a time
>    into master for integration.
>
>    Martin
>
>    Den 17. apr. 2013 14:08 skrev "Anders Logg" <[1]logg@xxxxxxxxx>
>    følgende:
>
>      One thing though is that it perhaps doesn't make sense to create the
>      'next' branch at this point, until it is being tested by the
>      buildbot?
>      I think Johannes is working on getting it running.
>
> Referenser
>
>    1. mailto:logg@xxxxxxxxx
>    2. mailto:meg@xxxxxxxxx
>    3. https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html
>    4. https://bitbucket.org/petsc/petsc/wiki/developer-instructions-git
>    5. https://bitbucket.org/petsc/petsc/wiki/quick-dev-git
>    6. https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html
>    7. https://launchpad.net/~fenics
>    8. mailto:fenics@xxxxxxxxxxxxxxxxxxx
>    9. https://launchpad.net/~fenics
>   10. https://help.launchpad.net/ListHelp
>   11. https://launchpad.net/~fenics
>   12. mailto:fenics@xxxxxxxxxxxxxxxxxxx
>   13. https://launchpad.net/~fenics
>   14. https://help.launchpad.net/ListHelp


Follow ups

References