search

ewels / clusterflow

A pipelining tool to automate and standardise bioinformatics analyses on cluster environments.
https://ewels.github.io/clusterflow/
GNU General Public License v3.0
97 stars 27 forks source link

BI Merge #89

Closed ewels closed 8 years ago

ewels commented 8 years ago

Ok @s-andrews and @FelixKrueger - I will continue working on this PR to make your changes compatible with the current version of CF.

ewels commented 8 years ago

(The reason for this branch workaround was that it avoids me having to commit to your repository, but lets us track the changes as I go).

ewels commented 8 years ago

Ok, I think that this should be ok to merge into master now. @s-andrews and @FelixKrueger could you please take a look?

Two diffs to look at - the commit fb4bae32f53d9e14247e1b1c73cba04cd7f47787 shows the initial merge, which is a bit of a mess. That has all of your changes mixed in with the things I had to change to remove the merge conflicts. I think that there will be a better view once the original PR is merged, but I don't know how to display that before then.

Easier to look at is this view - this shows changes I've made since that first merge, basically to bring the new modules in line with the new CF syntax.

Phil

ewels commented 8 years ago

Ok, merging as I want to go home :)