Skip to content

Commit 8d84134

Browse files
committed
coflicts log
1 parent c1e60c3 commit 8d84134

14 files changed

Lines changed: 1493 additions & 1780 deletions

content.html

Lines changed: 293 additions & 783 deletions
Large diffs are not rendered by default.

content_clean.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
© Copyright Kleinstein Lab, Yale University, 2026.
2-
Built with
1+
**No dataset at hand?**
2+
No problem, take one of our examples:

data/integration/runs/20260416T094701Z-57253f25/conflicts.20260416T094701Z-57253f25.jsonl

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,22 +1100,3 @@
11001100
{"olsdialog/*": {"remaining": [{"name": "ols-dialog", "types": "app", "source": ["biotools"], "description": "Java front end to the ontology lookup service (OLS).", "repository": [], "webpage": ["compomics.github.io/projects/ols-dialog"], "id": "biotools/ols-dialog/app/3.4.3"}, {"name": "ols-dialog", "types": "cmd", "source": ["biotools"], "description": "Java front end to the ontology lookup service (OLS).", "repository": [], "webpage": ["compomics.github.io/projects/ols-dialog"], "id": "biotools/ols-dialog/cmd/3.4.3"}], "disconnected": [{"name": "ols_dialog", "types": "app", "source": ["biotools"], "description": "Java front end to the\u00a0Ontology Lookup Service\u00a0allowing easy access to an extensive list of biomedical ontologies.", "repository": [], "webpage": ["code.google.com/p/ols-dialog"], "id": "biotools/ols_dialog/app/None"}]}}
11011101
{"gprofiler/*": {"remaining": [{"name": "gprofile_r", "types": "lib", "source": ["biotools"], "description": "GProfileR performs functional enrichment analysis, gene identifier conversion and mapping homologous genes across related organisms via the 'g:Profiler' toolkit. The tool performs statistical enrichment analysis to find over-representation of information like Gene Ontology terms, biological pathways, regulatory DNA elements, human disease gene annotations, and protein-protein interaction networks. The basic input is a list of genes.", "repository": [], "webpage": ["cran.r-project.org/web/packages/gprofiler/index"], "id": "biotools/gprofile_r/lib/0.6.1"}, {"name": "gprofile_r", "types": "suite", "source": ["biotools"], "description": "GProfileR performs functional enrichment analysis, gene identifier conversion and mapping homologous genes across related organisms via the 'g:Profiler' toolkit. The tool performs statistical enrichment analysis to find over-representation of information like Gene Ontology terms, biological pathways, regulatory DNA elements, human disease gene annotations, and protein-protein interaction networks. The basic input is a list of genes.", "repository": [], "webpage": ["cran.r-project.org/web/packages/gprofiler/index"], "id": "biotools/gprofile_r/suite/0.6.1"}], "disconnected": [{"name": "gprofiler", "types": "suite", "source": ["biotools"], "description": "Public web server with several tools to perform functional enrichment analyses and mine additional information about gene functions. The used data is synchronized with Ensembl database in quarterly updates.", "repository": [], "webpage": ["biit.cs.ut.ee/gprofiler"], "id": "biotools/gprofiler/suite/None"}]}}
11021102
{"stepwisecm/*": {"remaining": [{"name": "stepwisecm", "types": "cmd", "source": ["biotools"], "description": "This package implements a cancer samples classification strategy using multiple data sets. It uses the data type for which full measurements are available at the first stage, and the data type for which only partial measurements are available at the second stage. For incoming new samples, it quantifies how much improvement will be obtained if covariates of new samples for the data types at the second stage are measured.", "repository": [], "webpage": ["bioconductor.riken.jp/packages/3.1/bioc/html/stepwisecm"], "id": "biotools/stepwisecm/cmd/1.20.0"}, {"name": "stepwisecm", "types": "lib", "source": ["biotools"], "description": "This package implements a cancer samples classification strategy using multiple data sets. It uses the data type for which full measurements are available at the first stage, and the data type for which only partial measurements are available at the second stage. For incoming new samples, it quantifies how much improvement will be obtained if covariates of new samples for the data types at the second stage are measured.", "repository": [], "webpage": ["bioconductor.riken.jp/packages/3.1/bioc/html/stepwisecm"], "id": "biotools/stepwisecm/lib/1.20.0"}], "disconnected": [{"name": "stepwisecm", "types": "lib", "source": ["bioconductor"], "description": "Stepwise classification of cancer samples using multiple data sets. This package implements the classification strategy using two heterogeneous data sets without actually combining them. Package uses the data type for which full measurements are available at the first stage, and the data type for which only partial measurements are available at the second stage. For incoming new samples package quantifies how much improvement will be obtained if covariates of new samples for the data types at the second stage are measured. This packages suits for the application where study goal is not only obtain high classification accuracy, but also requires economically cheap classifier.", "repository": ["bioconductor.org/packages/stepwisecm"], "webpage": ["bioconductor.org/packages/stepwisecm"], "id": "bioconductor/stepwisecm/lib/1.25.0"}]}}
1103-
{"adam/*_secondary_1": {"remaining": [{"id": "biotools/ada-m/undefined/None"}], "disconnected": [{"id": "biotools/adam/cmd/None"}], "parent_block_id": "adam/*", "generated_at": "2026-04-20T16:34:27.125875"}}
1104-
{"freebayes/*_secondary_2": {"remaining": [{"id": "galaxy/freebayes/cmd/1.1.0.46-0"}], "disconnected": [{"id": "github/freebayes/None/None"}], "parent_block_id": "freebayes/*", "generated_at": "2026-04-20T16:34:27.125962"}}
1105-
{"csaw/*_secondary_3": {"remaining": [{"id": "bioconda_recipes/gsea/cmd/4.3.2"}], "disconnected": [{"id": "biotools/gsea/cmd/None"}], "parent_block_id": "csaw/*", "generated_at": "2026-04-20T16:34:27.127141"}}
1106-
{"atlas/*_secondary_4": {"remaining": [{"id": "biotools/atlas/cmd/2005"}], "disconnected": [{"id": "bioconda_recipes/atlas/cmd/0.9.9"}], "parent_block_id": "atlas/*", "generated_at": "2026-04-20T16:34:27.127595"}}
1107-
{"ica/*_secondary_5": {"remaining": [{"id": "biotools/biodica/app/None"}], "disconnected": [{"id": "sourceforge/ica/None/None"}], "parent_block_id": "ica/*", "generated_at": "2026-04-20T16:34:27.127777"}}
1108-
{"bioc/*_secondary_6": {"remaining": [{"id": "biotools/bio_c/cmd/1.0"}], "disconnected": [{"id": "sourceforge/bioc/None/None"}], "parent_block_id": "bioc/*", "generated_at": "2026-04-20T16:34:27.128045"}}
1109-
{"mango/*_secondary_7": {"remaining": [{"id": "biotools/mango/cmd/None"}], "disconnected": [{"id": "github/mango/None/None"}], "parent_block_id": "mango/*", "generated_at": "2026-04-20T16:34:27.128117"}}
1110-
{"cogent/*_secondary_8": {"remaining": [{"id": "bioconda_recipes/cogent/lib/1.9"}], "disconnected": [{"id": "biotools/cogent/lib/None"}], "parent_block_id": "cogent/*", "generated_at": "2026-04-20T16:34:27.128352"}}
1111-
{"intact/*_secondary_9": {"remaining": [{"id": "biotools/intact/db/None"}], "disconnected": [{"id": "sourceforge/intact/None/None"}], "parent_block_id": "intact/*", "generated_at": "2026-04-20T16:34:27.128377"}}
1112-
{"bamstats/*_secondary_10": {"remaining": [{"id": "biotools/bamstats/web/1.0.0"}], "disconnected": [{"id": "sourceforge/bamstats/None/None"}], "parent_block_id": "bamstats/*", "generated_at": "2026-04-20T16:34:27.128569"}}
1113-
{"chipseq/*_secondary_11": {"remaining": [{"id": "biotools/chip-seq/soap/None"}], "disconnected": [{"id": "sourceforge/chip-seq/None/None"}], "parent_block_id": "chipseq/*", "generated_at": "2026-04-20T16:34:27.128749"}}
1114-
{"conifer/*_secondary_12": {"remaining": [{"id": "biotools/conifer/script/None"}], "disconnected": [{"id": "sourceforge/conifer/None/None"}], "parent_block_id": "conifer/*", "generated_at": "2026-04-20T16:34:27.129511"}}
1115-
{"mia/*_secondary_13": {"remaining": [{"id": "biotools/m_ia/app/None"}], "disconnected": [{"id": "biotools/mia/app/None"}], "parent_block_id": "mia/*", "generated_at": "2026-04-20T16:34:27.129691"}}
1116-
{"rmap/*_secondary_14": {"remaining": [{"id": "bioconda_recipes/rmap/cmd/2.1"}], "disconnected": [{"id": "biotools/rmap/cmd/None"}], "parent_block_id": "rmap/*", "generated_at": "2026-04-20T16:34:27.129731"}}
1117-
{"gmdr/*_secondary_15": {"remaining": [{"id": "biotools/gmd-r/lib/0.3.3"}], "disconnected": [{"id": "sourceforge/gmdr/None/None"}], "parent_block_id": "gmdr/*", "generated_at": "2026-04-20T16:34:27.130550"}}
1118-
{"pscan/*_secondary_16": {"remaining": [{"id": "biotools/p-scan/cmd/None"}], "disconnected": [{"id": "biotools/pscan/cmd/r6"}], "parent_block_id": "pscan/*", "generated_at": "2026-04-20T16:34:27.131713"}}
1119-
{"spark/*_secondary_17": {"remaining": [{"id": "biotools/spar-k/cmd/None"}], "disconnected": [{"id": "biotools/spark/undefined/None"}], "parent_block_id": "spark/*", "generated_at": "2026-04-20T16:34:27.132526"}}
1120-
{"ctd/*_secondary_18": {"remaining": [{"id": "bioconductor/ctd/lib/0.99.5"}], "disconnected": [{"id": "sourceforge/ctd/None/None"}], "parent_block_id": "ctd/*", "generated_at": "2026-04-20T16:34:27.132930"}}
1121-
{"canopy/*_secondary_19": {"remaining": [{"id": "biotools/canopy/cmd/None"}], "disconnected": [{"id": "sourceforge/canopy/None/None"}], "parent_block_id": "canopy/*", "generated_at": "2026-04-20T16:34:27.133284"}}

data/integration/runs/20260416T094701Z-57253f25/grouped_entries.simplified.20260416T094701Z-57253f25.jsonl

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49544,22 +49544,3 @@
4954449544
{"xenmine/*": {"instances": ["biotools/xenmine/db/b_BETA_bUpdated_on", "biotools/xenmine/soap/b_BETA_bUpdated_on", "biotools/xenmine/web/b_BETA_bUpdated_on"]}}
4954549545
{"yeastmine/*": {"instances": ["biotools/yeastmine/db/Data_Updated_on", "biotools/yeastmine/soap/Data_Updated_on", "biotools/yeastmine/web/Data_Updated_on"]}}
4954649546
{"zebrafishmine/*": {"instances": ["biotools/zebrafishmine/db/Last_Build", "biotools/zebrafishmine/soap/Last_Build", "biotools/zebrafishmine/web/Last_Build"]}}
49547-
{"adam/*_secondary_1": {"instances": [{"_id": "biotools/ada-m/undefined/None"}, {"_id": "biotools/adam/cmd/None"}], "parent_block_id": "adam/*", "generated_at": "2026-04-20T16:34:27.125886"}}
49548-
{"freebayes/*_secondary_2": {"instances": [{"_id": "galaxy/freebayes/cmd/1.1.0.46-0"}, {"_id": "github/freebayes/None/None"}], "parent_block_id": "freebayes/*", "generated_at": "2026-04-20T16:34:27.125964"}}
49549-
{"csaw/*_secondary_3": {"instances": [{"_id": "bioconda_recipes/gsea/cmd/4.3.2"}, {"_id": "biotools/gsea/cmd/None"}], "parent_block_id": "csaw/*", "generated_at": "2026-04-20T16:34:27.127142"}}
49550-
{"atlas/*_secondary_4": {"instances": [{"_id": "biotools/atlas/cmd/2005"}, {"_id": "bioconda_recipes/atlas/cmd/0.9.9"}], "parent_block_id": "atlas/*", "generated_at": "2026-04-20T16:34:27.127597"}}
49551-
{"ica/*_secondary_5": {"instances": [{"_id": "biotools/biodica/app/None"}, {"_id": "sourceforge/ica/None/None"}], "parent_block_id": "ica/*", "generated_at": "2026-04-20T16:34:27.127778"}}
49552-
{"bioc/*_secondary_6": {"instances": [{"_id": "biotools/bio_c/cmd/1.0"}, {"_id": "sourceforge/bioc/None/None"}], "parent_block_id": "bioc/*", "generated_at": "2026-04-20T16:34:27.128047"}}
49553-
{"mango/*_secondary_7": {"instances": [{"_id": "biotools/mango/cmd/None"}, {"_id": "github/mango/None/None"}], "parent_block_id": "mango/*", "generated_at": "2026-04-20T16:34:27.128119"}}
49554-
{"cogent/*_secondary_8": {"instances": [{"_id": "bioconda_recipes/cogent/lib/1.9"}, {"_id": "biotools/cogent/lib/None"}], "parent_block_id": "cogent/*", "generated_at": "2026-04-20T16:34:27.128354"}}
49555-
{"intact/*_secondary_9": {"instances": [{"_id": "biotools/intact/db/None"}, {"_id": "sourceforge/intact/None/None"}], "parent_block_id": "intact/*", "generated_at": "2026-04-20T16:34:27.128378"}}
49556-
{"bamstats/*_secondary_10": {"instances": [{"_id": "biotools/bamstats/web/1.0.0"}, {"_id": "sourceforge/bamstats/None/None"}], "parent_block_id": "bamstats/*", "generated_at": "2026-04-20T16:34:27.128571"}}
49557-
{"chipseq/*_secondary_11": {"instances": [{"_id": "biotools/chip-seq/soap/None"}, {"_id": "sourceforge/chip-seq/None/None"}], "parent_block_id": "chipseq/*", "generated_at": "2026-04-20T16:34:27.128751"}}
49558-
{"conifer/*_secondary_12": {"instances": [{"_id": "biotools/conifer/script/None"}, {"_id": "sourceforge/conifer/None/None"}], "parent_block_id": "conifer/*", "generated_at": "2026-04-20T16:34:27.129514"}}
49559-
{"mia/*_secondary_13": {"instances": [{"_id": "biotools/m_ia/app/None"}, {"_id": "biotools/mia/app/None"}], "parent_block_id": "mia/*", "generated_at": "2026-04-20T16:34:27.129693"}}
49560-
{"rmap/*_secondary_14": {"instances": [{"_id": "bioconda_recipes/rmap/cmd/2.1"}, {"_id": "biotools/rmap/cmd/None"}], "parent_block_id": "rmap/*", "generated_at": "2026-04-20T16:34:27.129732"}}
49561-
{"gmdr/*_secondary_15": {"instances": [{"_id": "biotools/gmd-r/lib/0.3.3"}, {"_id": "sourceforge/gmdr/None/None"}], "parent_block_id": "gmdr/*", "generated_at": "2026-04-20T16:34:27.130552"}}
49562-
{"pscan/*_secondary_16": {"instances": [{"_id": "biotools/p-scan/cmd/None"}, {"_id": "biotools/pscan/cmd/r6"}], "parent_block_id": "pscan/*", "generated_at": "2026-04-20T16:34:27.131715"}}
49563-
{"spark/*_secondary_17": {"instances": [{"_id": "biotools/spar-k/cmd/None"}, {"_id": "biotools/spark/undefined/None"}], "parent_block_id": "spark/*", "generated_at": "2026-04-20T16:34:27.132528"}}
49564-
{"ctd/*_secondary_18": {"instances": [{"_id": "bioconductor/ctd/lib/0.99.5"}, {"_id": "sourceforge/ctd/None/None"}], "parent_block_id": "ctd/*", "generated_at": "2026-04-20T16:34:27.132931"}}
49565-
{"canopy/*_secondary_19": {"instances": [{"_id": "biotools/canopy/cmd/None"}, {"_id": "sourceforge/canopy/None/None"}], "parent_block_id": "canopy/*", "generated_at": "2026-04-20T16:34:27.133286"}}

data/integration/runs/latest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20260416T094701Z-57253f25
1+
20260420T214128Z-c1e60c32

0 commit comments

Comments
 (0)