Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Diff: devex vs dev #128

Draft
wants to merge 90 commits into
base: dev
Choose a base branch
from
Draft

Diff: devex vs dev #128

wants to merge 90 commits into from

Conversation

aclark02-arcus
Copy link
Collaborator

PR to show differences between the devex and dev branches

aclark02-arcus and others added 30 commits October 29, 2024 10:03
Merge branch 'devex' into jt-99-review_by_row-devex

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

# Conflicts:
#	DESCRIPTION
jthompson-arcus and others added 30 commits December 3, 2024 11:48
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"
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.

2 participants