-
Notifications
You must be signed in to change notification settings - Fork 22
Open
Description
pollinator:features davetarc$ git recreate-branch QA -x f-585_orphaned_reference_fields --list
==> 1. Processing branch 'QA' for merge-commits...
Branches to be merged:
- f-585_orphaned_reference_fields
- f-747_action_email_scheduler
- f-749_consultation_due_date_shuffle
- f-794_fix_async_layer_spinner
- f-657_minor_deceased_facet
- f-780_species_type_unset_on_interview_import
- f-790_security_updates
- f-646_communications
- hotfix-792_intersection_block_labels
- f-748_new_access_field
- f-744_open_actions_block
- f-644_due_date_color
- f-418_species_confidential_field
- f-784_location_photo_var
- f-522_phpexcel_version
- f-685_respondent_avatar_missing
- f-793_tu_value_csv_updates
- f-676_consult_review_action
pollinator:features davetarc$ git recreate-branch QA -x f-585_orphaned_reference_fields
==> 1. Processing branch 'QA' for merge-commits...
Warning: The following branches will be merged when the new QA branch is created: - f-747_action_email_scheduler
- f-749_consultation_due_date_shuffle
- f-794_fix_async_layer_spinner
- f-657_minor_deceased_facet
- f-780_species_type_unset_on_interview_import
- f-790_security_updates
- f-646_communications
- hotfix-792_intersection_block_labels
- f-748_new_access_field
- f-744_open_actions_block
- f-644_due_date_color
- f-418_species_confidential_field
- f-784_location_photo_var
- f-522_phpexcel_version
- f-685_respondent_avatar_missing
- f-793_tu_value_csv_updates
- f-676_consult_review_action
If you see something unexpected check:
a) that your 'QA' branch is up to date
b) if 'master' is a branch, make sure it is also up to date.
Warning: If there are any non-merge commits in 'QA', they will not be included in 'QA'. You have been warned.
Proceed with QA branch recreation? [y/N]
y
==> 2. Creating backup of 'QA', 'BRANCH-PER-FEATURE-PREFIX-QA'...
==> 3. Creating new 'QA' branch based on 'master'...
==> 4. Merging in feature branches...
- 'f-747_action_email_scheduler'
- 'f-749_consultation_due_date_shuffle'
- 'f-794_fix_async_layer_spinner'
- 'f-657_minor_deceased_facet'
- 'f-780_species_type_unset_on_interview_import'
- 'f-790_security_updates'
- 'f-646_communications'
- 'hotfix-792_intersection_block_labels'
- 'f-748_new_access_field'
- 'f-744_open_actions_block'
- 'f-644_due_date_color'
Staged 'modules/features/consultation/includes/consultation.api.inc' using previous resolution.
Staged 'themes/custom/ieg_cis/styles/less/children/nodes.less' using previous resolution. - 'f-418_species_confidential_field'
- 'f-784_location_photo_var'
- 'f-522_phpexcel_version'
- 'f-685_respondent_avatar_missing'
- 'f-793_tu_value_csv_updates'
- 'f-676_consult_review_action'
Staged 'modules/features/consultation/consultation.ds.inc' using previous resolution.
==> 5. Cleaning up temporary branches ('BRANCH-PER-FEATURE-PREFIX-QA').
Metadata
Metadata
Assignees
Labels
No labels