Metagenomic unifrac

[wasade]

Depends on #20

[wasade]

@ElDeveloper conflicts resolved

[wasade]

...I don't understand why its showing conflicts still? I do not see these locally...

[ElDeveloper]

When you click on the "Resolve Conflicts" button on the web UI, do you see any of those locally?

…

On (Aug-21-17|19:06), Daniel McDonald wrote: ...I don't understand why its showing conflicts still? I do not see these locally... -- You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub: #22 (comment)

[wasade]

Nope On Mon, Aug 21, 2017 at 12:10 PM, Yoshiki Vázquez Baeza < [email protected]> wrote:

…

When you click on the "Resolve Conflicts" button on the web UI, do you see any of those locally? On (Aug-21-17|19:06), Daniel McDonald wrote: > ...I don't understand why its showing conflicts still? I do not see these locally... > > -- > You are receiving this because you were mentioned. > Reply to this email directly or view it on GitHub: > #22 issuecomment-323825339 — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#22 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAc8svS7i8oBpAicrY_S_sWf28gMlseBks5sadYfgaJpZM4O6l_x> .

[wasade]

(qiime2-2017.6) 12:08:04 (mcdonadt@codinator):q2-state-unifrac@master$ git pull origin master
From github.com:wasade/q2-state-unifrac
 * branch            master     -> FETCH_HEAD
Already up-to-date.
(qiime2-2017.6) 12:20:55 (mcdonadt@codinator):q2-state-unifrac@master$ git checkout meta
Switched to branch 'meta'
(qiime2-2017.6) 12:20:58 (mcdonadt@codinator):q2-state-unifrac@meta$ git merge master
Already up-to-date.
(qiime2-2017.6) 12:21:03 (mcdonadt@codinator):q2-state-unifrac@meta$ git pull origin master
From github.com:wasade/q2-state-unifrac
 * branch            master     -> FETCH_HEAD
Already up-to-date.

# a "conflicted" file
(qiime2-2017.6) 12:21:10 (mcdonadt@codinator):q2-state-unifrac@meta$ cat q2_state_unifrac/__init__.py
# ----------------------------------------------------------------------------
# Copyright (c) 2016-2017, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
# The full license is in the file LICENSE, distributed with this software.
# ----------------------------------------------------------------------------

import pkg_resources

from q2_state_unifrac._methods import (unweighted,
                                       weighted_normalized,
                                       weighted_unnormalized,
                                       generalized, meta)


__version__ = pkg_resources.get_distribution('q2-state-unifrac').version
__all__ = ['unweighted', 'weighted_normalized', 'weighted_unnormalized',
           'generalized', 'meta']

[wasade]

also:

(qiime2-2017.6) 12:21:16 (mcdonadt@codinator):q2-state-unifrac@meta$ git pull origin meta
From github.com:wasade/q2-state-unifrac
 * branch            meta       -> FETCH_HEAD
Already up-to-date.

[ElDeveloper]

Closing this in favor of #24