Record types that allow a choice only between reverting or accepting the pulled or current record

• sys_choice [Choice]
• sys_choice_set [Choice Set]
• sys_ui_form [Form]
• sys_ui_list [List]
• sys_ui_related_list [Related List]
• sys_ui_section [Form Section]
• wf_workflow [Workflow]
• wf_workflow_version [Workflow Version]

Team Development, Resolve Collision page: Use Pulled Version and Use Local Version options.

Upgrade History, Compare to Current page: Comparing non-current update versions to current update version. Allows only Revert to Base System option.

Field types that do not support merging

The following field types do not support individual merging between versions or updates:

• auto_increment [Auto Increment]
• auto_number [Auto Number]
• breakdown_element [Breakdown Element]
• catalog_preview [Catalog Preview]
• collection [Collection]
• color_display [Color Display]
• composite_field [Composite Field]
• compressed [Compressed]
• counter [Counter]
• currency [Counter]
• data_array [Data Array]
• data_object [Data Object]
• data_structure [Data Structure]
• date [Other Date]
• datetime [Basic Date/Time]
• days_of_week [Days of Week]
• document_id [Document ID]
• due_date [Due Date]
• Email [Email]
• external_names [External Names]
• field_list [Field List]
• float [Floating Point Number]
• glide_action_list [UI Action List]
• glide_precise_time [Precise Time]
• glide_var [Glide Var]
• image [Basic Image]
• index_name [Index Name]
• int [Integer String]
• integer_time [Integer Time]
• ip_address [IP Address]
• journal [Journal]
• journal_input [Journal Input]
• journal_list [Journal List]
• long [Long Integer String]
• mask_code [Mask Code]
• metric_absolute [Metric Absolute]
• metric_counter [Metric Counter]
• metric_derive [Metric Derive]
• metric_gauge [Metric Gauge]
• mid_config [MID Server Configuration]
• month_of_year [Month of Year]
• multi_small [Multiple Line Small Text Area]
• name_values [Name/Values]
• nl_task_int1 [NL Task Integer 1]
• order_index [Order Index]
• password [Password (1 Way Encrypted)]
• percent_complete [Percent Complete]
• ph_number [Phone Number]
• phone_number [Phone Number (Unused)]
• phone_number_e164 [Phone Number (E164)]
• price [Price]
• reference_name [Reference Name]
• related_tags [Related Tags]
• reminder_field_name [Reminder Field Name]
• repeat_count [Repeat Count]
• repeat_type [Repeat Type]
• replication_payload [Replication Payload]
• schedule_date_time [Schedule Date/Time]
• short_field_name [Short Field Name]
• short_table_name [Short Table Name]
• Slushbucket [slushbucket]
• source_id [Source ID]
• source_name [Source Name]
• source_table [Source Table]
• string_boolean [<none>]
• sys_class_name [System Class Name]
• sysrule_field_name [System Rule Field Name]
• table []
• text []
• time []
• timer [Timer]
• translated [Translated]
• tree_code [Tree Code]
• tree_path [Tree Path]
• user_image [Image]
• user_input [User Input]
• variables [Variables]
• version [Version]
• video [Video]
• week_of_month [Week of Month]
• wide_text [Wide Text]
• wms_job [WMS Job]
• workflow [Workflow]