differences for PR #138

carpentries-lab · Sep 18, 2023 · 478af50 · 478af50
1 parent a5102eb
commit 478af50
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/04-collaboration.md b/04-collaboration.md
@@ -32,7 +32,7 @@ they know *what* to contribute, and make the contribution process clear
 so that they know *how* to contribute. You also want to make it easy for
 people to give you credit for your work.
 
-::::::::::::::::::::::::::::::::::::::  discussion
+::::::::::::::::::::::::::::::::::::::  challenge
 
 ## Collaboration opportunities and challenges
 
@@ -42,7 +42,7 @@ Discussion
 - What goes wrong with collaboration?
 - How can you prepare to collaborate?
 
-:::::::::::::::  solution
+:::::::::::::::::  solution
 
 ## Suggestions
 

diff --git a/05-project_organization.md b/05-project_organization.md
@@ -249,8 +249,6 @@ For your information, to encode experimental details the following conventions w
 - measurement date
 - other details are timepoint and raw or normalized data
 
-:::::::::::::::  solution
-
 ```
 2020-07-14_s12_phyB_on_SD_t04.raw.csv  
 2020-07-14_s1_phyA_on_LD_t05.raw.csv  
@@ -272,8 +270,6 @@ SD_phya_ons_t04_2020-07-12.norm.csv
 ld_phyA_ons_t04_2020-08-12.norm.csv  
 ```
 
-:::::::::::::::::::::::::
-
 - What are the problems with having the date first?
 - How do different date formats behave once sorted?
 - Can you tell the importance of a leading 0 (zeros)?
@@ -282,21 +278,27 @@ ld_phyA_ons_t04_2020-08-12.norm.csv
 - Do you see benefits of keeping consistent lengths of the naming conventions?
 - Do you see what happens when you mix conventions?
 
-> ## Solution
-> 
-> - Using dates up front makes it difficult to quickly find data for
->   particular conditions or genotypes. It also masks the "logical" order of samples
->   or timepoints.
-> - Named months break the "expected" sorting, same as dates without leading 0
-> - Without leading zeros, 's12' appear before s1 and s2
-> - the first (and second) part of the name are easiest to spot
-> - the last file is also from LD conditions, but appears after SD, same with 'phya' genotypes
-> - the last 3 file names are easiest to read as all parts appear on top of each other
->   due to the same 3 letter-length codes ons and off
-> - The lack of consistency makes it very difficult to get data from related samples/conditions.
+::::::::::::::::::::::::: solution
+
+
+
+## Solution
+
+ - Using dates up front makes it difficult to quickly find data for
+   particular conditions or genotypes. It also masks the "logical" order of samples
+   or timepoints.
+ - Named months break the "expected" sorting, same as dates without leading 0
+ - Without leading zeros, 's12' appear before s1 and s2
+ - the first (and second) part of the name are easiest to spot
+ - the last file is also from LD conditions, but appears after SD, same with 'phya' genotypes
+ - the last 3 file names are easiest to read as all parts appear on top of each other
+   due to the same 3 letter-length codes ons and off
+ - The lack of consistency makes it very difficult to get data from related samples/conditions.
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 
+:::::::::::::::::::::::::::
+
 :::::::::::::::::::::::::::::::::::::::::  callout
 
 ## Some helpful organisation tools

diff --git a/md5sum.txt b/md5sum.txt
@@ -7,8 +7,8 @@
 "episodes/01-introduction.md" "20db3572b403389eccd97c3425717354" "site/built/01-introduction.md" "2023-08-31"
 "episodes/02-data_management.md" "ec17a220df1259ef60ed84f8fbffd3b2" "site/built/02-data_management.md" "2023-09-07"
 "episodes/03-software.md" "7dc30bc0c113045c390ba3c8e4fcbf94" "site/built/03-software.md" "2023-08-31"
-"episodes/04-collaboration.md" "848baa2446adb0473073b8340b59c121" "site/built/04-collaboration.md" "2023-08-31"
-"episodes/05-project_organization.md" "f49ce7c3a31770ddb6d5a969ac4fc5a7" "site/built/05-project_organization.md" "2023-08-31"
+"episodes/04-collaboration.md" "55f160010b664f8f10c3f8d688461468" "site/built/04-collaboration.md" "2023-09-18"
+"episodes/05-project_organization.md" "8c2311609009a28b64107e732622ac22" "site/built/05-project_organization.md" "2023-09-18"
 "episodes/06-track_changes.md" "b02e8243730f0192d4418b6843fc72e0" "site/built/06-track_changes.md" "2023-09-07"
 "episodes/07-manuscripts.md" "cd54d77e18d0e00bdd0ad41343e461ad" "site/built/07-manuscripts.md" "2023-08-31"
 "episodes/08-what_next.md" "d7f89e1953957185712810e48661387a" "site/built/08-what_next.md" "2023-08-31"