-
Notifications
You must be signed in to change notification settings - Fork 418
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Mothur: fixed issues with chimera tools #448
Conversation
Thanks for the contribution @oxyko |
Will do. |
@oxyko this file is still 17.000 lines, is this correct? |
Can you please rebase/squash against master to get rid of the large file from the git history? Thanks! Let me know if you need help with squashing commits. |
I've removed the test files and tried the rebase/squash, but I'm afraid I'm in a bit of a mess and my HEAD is now detached. Could you see if you can bring in the current pull as it is? If not, I'll do the hard reset on mothur branch, redo the changes and do a new pull request. |
I guess we can merge this branch and ry to rebase the master mothur branch before merging into main. @martenson does this sound reasonable? If so please feel free to merge. |
Thanks guys! I'll try and be more careful with rebasing and test data size next time. |
@bgruening I tried to do the rebase locally and it is not easy. If you see the diff in GitHub you will notice that only one or two commits are actually being shown - all other changes are both commited and then reverted resulting in every commit having conflicts while rebasing (e.g. all the whitespace changes are missing). This needs some handwork :/ |
OK, doing a hard reset on mothur and re-applying the changes. |
@oxyko thanks. Just to explain the mess. We try to keep this repository as small as possible, hence we try to keep test data small. |
Issue described in #419. Also, added test data and test for chimera.slayer. But test is commented out, because planemo wasn't able to run it. Will need to revisit it once mothur wrapper tests are in good shape.