refactor: removed "accept all" buttons

Author: IacopoSb

src/Resources/Locales/en_US.axaml

@@ -874,12 +874,6 @@
   <x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">Delete selected {0} tags...</x:String>
   <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Merge ${0}$ into ${1}$...</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Push ${0}$...</x:String>
-  <x:String x:Key="Text.MergeConflictEditor.AcceptMine" xml:space="preserve">ACCEPT ALL MINE</x:String>
-  <x:String x:Key="Text.MergeConflictEditor.AcceptMine.Tip" xml:space="preserve">Resolve all conflicts using Mine version</x:String>
-  <x:String x:Key="Text.MergeConflictEditor.AcceptTheirs" xml:space="preserve">ACCEPT ALL THEIRS</x:String>
-  <x:String x:Key="Text.MergeConflictEditor.AcceptTheirs.Tip" xml:space="preserve">Resolve all conflicts using Theirs version</x:String>
-  <x:String x:Key="Text.MergeConflictEditor.AcceptBoth" xml:space="preserve">ACCEPT ALL BOTH</x:String>
-  <x:String x:Key="Text.MergeConflictEditor.AcceptBoth.Tip" xml:space="preserve">Resolve all conflicts using both versions</x:String>
   <x:String x:Key="Text.MergeConflictEditor.AcceptBoth.MineFirst" xml:space="preserve">First Mine, then Theirs</x:String>
   <x:String x:Key="Text.MergeConflictEditor.AcceptBoth.TheirsFirst" xml:space="preserve">First Theirs, then Mine</x:String>
   <x:String x:Key="Text.MergeConflictEditor.UseBoth" xml:space="preserve">USE BOTH</x:String>

src/Views/MergeConflictEditor.axaml

@@ -62,48 +62,6 @@
 
           <Rectangle Width="1" Fill="{DynamicResource Brush.Border2}" Margin="4,4"/>
 
-          <!-- All Conflicts Resolution -->
-          <Button Classes="flat"
-                  Content="{DynamicResource Text.MergeConflictEditor.AcceptMine}"
-                  Click="OnAcceptMine"
-                  ToolTip.Tip="{DynamicResource Text.MergeConflictEditor.AcceptMine.Tip}"
-                  IsEnabled="{Binding HasUnresolvedConflicts}"/>
-          <Button Classes="flat"
-                  Content="{DynamicResource Text.MergeConflictEditor.AcceptTheirs}"
-                  Click="OnAcceptTheirs"
-                  ToolTip.Tip="{DynamicResource Text.MergeConflictEditor.AcceptTheirs.Tip}"
-                  IsEnabled="{Binding HasUnresolvedConflicts}"/>
-          <Button Classes="flat"
-                  ToolTip.Tip="{DynamicResource Text.MergeConflictEditor.AcceptBoth.Tip}"
-                  IsEnabled="{Binding HasUnresolvedConflicts}">
-            <StackPanel Orientation="Horizontal" Spacing="4">
-              <TextBlock Text="{DynamicResource Text.MergeConflictEditor.AcceptBoth}"/>
-              <Path Width="10" Height="10" Data="{StaticResource Icons.Down}" VerticalAlignment="Center"/>
-            </StackPanel>
-            <Button.Flyout>
-              <MenuFlyout Placement="BottomEdgeAlignedLeft">
-                <MenuItem Click="OnAcceptBothMineFirst">
-                  <MenuItem.Icon>
-                    <Path Width="12" Height="12" Data="{StaticResource Icons.February}" Fill="{DynamicResource Brush.Diff.MineHeader}"/>
-                  </MenuItem.Icon>
-                  <MenuItem.Header>
-                    <TextBlock Text="{DynamicResource Text.MergeConflictEditor.AcceptBoth.MineFirst}"/>
-                  </MenuItem.Header>
-                </MenuItem>
-                <MenuItem Click="OnAcceptBothTheirsFirst">
-                  <MenuItem.Icon>
-                    <Path Width="12" Height="12" Data="{StaticResource Icons.February}" Fill="{DynamicResource Brush.Diff.TheirsHeader}"/>
-                  </MenuItem.Icon>
-                  <MenuItem.Header>
-                    <TextBlock Text="{DynamicResource Text.MergeConflictEditor.AcceptBoth.TheirsFirst}"/>
-                  </MenuItem.Header>
-                </MenuItem>
-              </MenuFlyout>
-            </Button.Flyout>
-          </Button>
-
-          <Rectangle Width="1" Fill="{DynamicResource Brush.Border2}" Margin="4,4"/>
-
           <!-- Save -->
           <Button Classes="flat primary"
                   Content="{DynamicResource Text.MergeConflictEditor.SaveAndStage}"