[AMBER-Developers] Some comments on git branches

From: case <case.biomaps.rutgers.edu>
Date: Fri, 10 Dec 2010 09:49:31 -0500

Hi everyone:

I note that developers are indeed making quite a bit of use of branches at
the main sdsc repository. Some of you are also merging the master into your
branch periodically; this is good, since it reduces the difference between
your branch and the master. If there are conflicts, the sooner one finds them
out, the easier they usually are to fix. If you are not in the habit of
merging the master branch into yours, please consider doing that.

However, the downside of branches is that (mostly) no one else will ever use
the code, aside from the branch creator. The nightly test suite is only run
on the master as well. As we move towards a new release of AmberTools, we
want to get the widest possible testing and use of new code. As a simple
example, code in the master branch will get compiled on lots of compilers, but
code in the branches may only even get compiled (let alone tested) on a very
limited subset of these.

Hence, please consider merging your branch back into the master, when you feel
the code is relatively stable. You can then continue development in the
branch, but future merges will be simpler. Anyone with code planned for
release in April (AmberTools 1.5) should try to do such merges as soon as you
can, in any event by Jan. 15, 2011.


AMBER-Developers mailing list
Received on Fri Dec 10 2010 - 07:00:04 PST
Custom Search