search

biocore / American-Gut

American Gut open-access data and IPython notebooks
Other
113 stars 81 forks source link

American gut fixes #40

Closed jwdebelius closed 10 years ago

jwdebelius commented 10 years ago

Updated for rounding to 0.

ElDeveloper commented 10 years ago

@JWDebelius there seems to be a conflict with this branch, would you mind resolving them:

yoshikivazquezbaeza:American-Gut@AmericanGutFixes$ git pull justine AmericanGutFixes 
remote: Counting objects: 15, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 10 (delta 8), reused 10 (delta 8)
Unpacking objects: 100% (10/10), done.
From git://github.com/JWDebelius/American-Gut
 * branch            AmericanGutFixes -> FETCH_HEAD
Auto-merging tests/test_generate_otu_signifigance.py
CONFLICT (content): Merge conflict in tests/test_generate_otu_signifigance.py
Auto-merging americangut/generate_otu_signifigance_tables.py
CONFLICT (content): Merge conflict in americangut/generate_otu_signifigance_tables.py
Automatic merge failed; fix conflicts and then commit the result.
ElDeveloper commented 10 years ago

@JWDebelius would you mind resolving the conflicts in this PR?

jwdebelius commented 10 years ago

I thought they were resolved. I merged the branches and fixed the merge. I'm not sure what to do beyond that?

On Wed, Nov 20, 2013 at 9:13 AM, Yoshiki Vázquez Baeza < notifications@github.com> wrote:

@JWDebelius https://github.com/JWDebelius would you mind resolving the conflicts in this PR?

— Reply to this email directly or view it on GitHubhttps://github.com/qiime/American-Gut/pull/40#issuecomment-28902688 .

ElDeveloper commented 10 years ago

Did you push this back to the branch on GitHub?

On Nov 20, 2013, at 10:58 AM, J W Debelius notifications@github.com wrote:

I thought they were resolved. I merged the branches and fixed the merge. I'm not sure what to do beyond that?

On Wed, Nov 20, 2013 at 9:13 AM, Yoshiki Vázquez Baeza < notifications@github.com> wrote:

@JWDebelius https://github.com/JWDebelius would you mind resolving the conflicts in this PR?

— Reply to this email directly or view it on GitHubhttps://github.com/qiime/American-Gut/pull/40#issuecomment-28902688 .

— Reply to this email directly or view it on GitHub.

jwdebelius commented 10 years ago

I hope that's what I just did.

ElDeveloper commented 10 years ago

There's still a conflict, you only pushed one commit not the merge with the master branch. If you need help let me know and we can try to figure it out later today.

On Nov 20, 2013, at 12:36 PM, J W Debelius notifications@github.com wrote:

I hope that's what I just did.

— Reply to this email directly or view it on GitHub.

ElDeveloper commented 10 years ago

Thanks! :+1: