Resolve merge conflicts

best-practice-and-impact · Nov 15, 2023 · 79af569 · 79af569
2 parents f5bff2a + 14d41b5
commit 79af569
Show file tree

Hide file tree

Showing 4 changed files with 1,013 additions and 7 deletions.
diff --git a/R/derive_vars.R b/R/derive_vars.R
@@ -20,7 +20,7 @@ derive_vars <- function(data) {
 
 #' @title Derive language status
 #'
-#' @description Derve the status of each programmming language as "access" (access only), "knowledge" (knowledge only), "both" or "neither".
+#' @description Derive the status of each programmming language as "access" (access only), "knowledge" (knowledge only), "both" or "neither".
 #'
 #' @param data tidied CARS wave 3 data (data.frame).
 #'
@@ -85,7 +85,7 @@ derive_basic_rap_scores <- function(data) {
                         "prac_open_source_own",
                         "prac_version_control",
                         "prac_review",
-                        "prac_AQUA_book",
+                        "prac_development_QA",
                         "doc_comments",
                         "doc_readme")
 
@@ -102,7 +102,7 @@ derive_basic_rap_scores <- function(data) {
                        "open_code_score",
                        "version_control_score",
                        "peer_review_score",
-                       "AQUA_book_score",
+                       "development_QA_score",
                        "doc_score")
 
   high_vals <- c("Regularly", "All the time")