Skip to content

Conversation

@aclark02-arcus
Copy link
Collaborator

PR to show differences between the devex and dev branches

aclark02-arcus and others added 18 commits November 11, 2024 08:56
Merge branch 'devex' into jt-99-review_by_row-devex

# Conflicts:
#	DESCRIPTION
Merge branch 'dev' into jt-resolve_merge_conflicts_dev

# Conflicts:
#	DESCRIPTION
Merge branch 'dev' into jt-update_devex

# Conflicts:
#	DESCRIPTION
Merge branch 'jt-99-review_by_row_for_reals' into jt-99-review_by_row-devex

# Conflicts:
#	DESCRIPTION
#	R/mod_common_forms.R
#	R/mod_study_forms.R
#	inst/golem-config.yml
#	tests/testthat/_snaps/app_feature_01/app-feature-1-002.json
#	tests/testthat/_snaps/app_feature_01/app-feature-1-003.json
#	tests/testthat/_snaps/app_feature_01/app-feature-1-004.json
#	tests/testthat/_snaps/app_feature_01/app-feature-1-005.json
#	tests/testthat/_snaps/app_feature_03/app-feature-3-002.json
#	tests/testthat/_snaps/mod_study_forms/study_forms-001.json
#	tests/testthat/_snaps/mod_study_forms/study_forms-002.json
Merge branch 'devex' into jt-99-review_by_row-devex

# Conflicts:
#	DESCRIPTION
Merge branch 'jt-99-review_by_row_for_reals' into jt-99-review_by_row-devex

# Conflicts:
#	R/mod_common_forms.R
#	R/mod_study_forms.R
Devex: Review by records instead of `subject_id` & `form_id` "rv_row"
Merge branch 'dev' into devex

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	R/mod_common_forms.R
#	R/mod_study_forms.R
#	inst/golem-config.yml
#	tests/testthat/_snaps/app_feature_01/app-feature-1-002.json
#	tests/testthat/_snaps/app_feature_01/app-feature-1-003.json
#	tests/testthat/_snaps/app_feature_01/app-feature-1-004.json
#	tests/testthat/_snaps/app_feature_01/app-feature-1-005.json
#	tests/testthat/_snaps/app_feature_03/app-feature-3-002.json
#	tests/testthat/_snaps/mod_study_forms/study_forms-001.json
#	tests/testthat/_snaps/mod_study_forms/study_forms-002.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants