Hi, Just doing a dry run of the merge of release into develop and Im getting a large number of conflicts with mustella baseline images.
Anyone have any idea why and if it's an issue? Perhaps they were checked into the wrong branch or both branches and the develop branch after the release branch?? For example: C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_all.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedArial.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedVerdana.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_inset.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textdecoration_underline.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_outset.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_lr.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingRight.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_top.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontsize_16.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedArial.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_bottom.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_alternatingitemcolors.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalgridlinestrue.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_headercolors.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontstyle_italic.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontweight_bold.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingLeft.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_userollover.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdirection_right.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_dropShadowEnabled_true.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedVerdana.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdistance_8.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingTop.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingbottom.png C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontfamily_arial.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_groupedview.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_verticalscrollpolicy_auto.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_width_200.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_formatting_withcolgroups.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/use_grouped_data_mirroring.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_draggablecolumns_false_state1.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_draggablecolumns_false_state2.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_width_700.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_verticalscrollpolicy.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_height_30.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/phone.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_insertcolumn_withcolgroups.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_hierarch_data_colgroups.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_enabled2.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_y_50.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_verticalscrollposition.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/date.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_horizontalscrollpolicy_off.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_insertcolumngroups.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_x_minus10.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_y_minus10.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_columnspanning_withcolgroups.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/groupview.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_groupedview_withcolgroups.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/zipcode.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_tree_displayitemsexpanded.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_multicellselection.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_customheaderrenderer_withcolgroups.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/property_layoutDirection_rtl.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/property_layoutDirection_ltr.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_verticalscrollpolicy_on.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_focusenabledfalse.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_tree_singlecellselection.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/property_layoutDirection_application.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_headerrenderer_withcolgroups.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_rowcount_withcolgroups.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_x_50.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_tree_multicellselection.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_groupeditable_withcolgroups.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/columnspan.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_itemeditable_withcolgroups.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_width_30.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/style1.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/style2.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_horizontalscrollpolicy_on.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/style3.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_visible_withcolgroups.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_singlecellselection.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/property_layoutDirection_application_ltr.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_height_200.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/number.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_treeview.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_height_120.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_draggablecolumns_state1.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_focusenabledtrue.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/currency.png C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_draggablecolumns_state2.png Thanks, Justin
