[Biopython-dev] Documentation for the Bio.phenotype

Peter Cock p.j.a.cock at googlemail.com
Thu Jan 21 16:52:11 UTC 2016

Thanks Marco,

Your reworked branch and pull request sorted out the merge problem:



On Sat, Dec 19, 2015 at 11:21 AM, Marco Galardini
<marco.galardini at unifi.it> wrote:
> Hi,
> I've added a chapter to the documentation for the potential addition of the
> Bio.phenotype module (PR here:
> https://github.com/biopython/biopython/pull/598). Unfortunately, in order to
> get my branch up to date to the current form of the tutorial (several
> chapters instead of one file) I think that I should have made a merge and
> not a rebase. Is this gonna be a problem? I think I can probably fix it if
> needed.
> Marco
> _______________________________________________
> Biopython-dev mailing list
> Biopython-dev at mailman.open-bio.org
> http://mailman.open-bio.org/mailman/listinfo/biopython-dev

More information about the Biopython-dev mailing list