Allow hiding the "Resolve with Copilot" button in the merge conflicts dialog

Author: pol-rivero

app/src/ui/app.tsx

@@ -2540,6 +2540,10 @@ export class App extends React.Component<IAppProps, IAppState> {
               this.state.copilotModels,
               this.state.byokProviders
             )}
+            conflictResolutionDisabled={
+              this.state.selectedCopilotModels['conflict-resolution'] ===
+              DisabledCopilotModel
+            }
             openFileInExternalEditor={this.getOpenFileInExternalEditorHandler(
               popup.repository
             )}

app/src/ui/multi-commit-operation/base-multi-commit-operation.tsx

@@ -65,6 +65,11 @@ export interface IMultiCommitOperationProps {
    */
   readonly copilotConflictResolutionModel: IConflictResolutionModelDisplay
 
+  /**
+   * Whether to hide the "Resolve with Copilot" button.
+   */
+  readonly conflictResolutionDisabled: boolean
+
   /**
    * Callbacks for the conflict selection components to let the user jump out
    * to their preferred editor.
@@ -292,7 +297,11 @@ export abstract class BaseMultiCommitOperation extends React.Component<IMultiCom
             openFileInExternalEditor={openFileInExternalEditor}
             openRepositoryInShell={openRepositoryInShell}
             someConflictsHaveBeenResolved={this.setConflictsHaveBeenResolved}
-            onResolveWithCopilot={this.onResolveWithCopilot}
+            onResolveWithCopilot={
+              this.props.conflictResolutionDisabled
+                ? undefined
+                : this.onResolveWithCopilot
+            }
           />
         )
       }

app/src/ui/multi-commit-operation/multi-commit-operation.tsx

@@ -38,6 +38,7 @@ export class MultiCommitOperation extends React.Component<IMultiCommitOperationP
             copilotConflictResolutionModel={
               this.props.copilotConflictResolutionModel
             }
+            conflictResolutionDisabled={this.props.conflictResolutionDisabled}
             openFileInExternalEditor={this.props.openFileInExternalEditor}
             resolvedExternalEditor={this.props.resolvedExternalEditor}
             openRepositoryInShell={this.props.openRepositoryInShell}
@@ -64,6 +65,7 @@ export class MultiCommitOperation extends React.Component<IMultiCommitOperationP
             copilotConflictResolutionModel={
               this.props.copilotConflictResolutionModel
             }
+            conflictResolutionDisabled={this.props.conflictResolutionDisabled}
             openFileInExternalEditor={this.props.openFileInExternalEditor}
             resolvedExternalEditor={this.props.resolvedExternalEditor}
             openRepositoryInShell={this.props.openRepositoryInShell}
@@ -90,6 +92,7 @@ export class MultiCommitOperation extends React.Component<IMultiCommitOperationP
             copilotConflictResolutionModel={
               this.props.copilotConflictResolutionModel
             }
+            conflictResolutionDisabled={this.props.conflictResolutionDisabled}
             openFileInExternalEditor={this.props.openFileInExternalEditor}
             resolvedExternalEditor={this.props.resolvedExternalEditor}
             openRepositoryInShell={this.props.openRepositoryInShell}