Refactor conflict resolution and migrate state to context

Updates ConflictResolverPanel and moves conflict-related state management into AppStateContext.

Author: timbornemann

src/components/StagingArea.tsx

@@ -218,10 +218,6 @@ export const StagingArea: React.FC<StagingAreaProps> = ({
           onOpenConflictResolver={onOpenConflictResolver}
           isConflictBlockCountPending={conflicts.isConflictBlockCountPending}
           totalConflictBlocksInView={totalConflictBlocksInView}
-          mergeContinue={conflicts.mergeContinue}
-          mergeAbort={conflicts.mergeAbort}
-          rebaseContinue={conflicts.rebaseContinue}
-          rebaseAbort={conflicts.rebaseAbort}
           conflictEditor={conflicts.conflictEditor}
           isConflictEditorLoading={conflicts.isConflictEditorLoading}
           blockCountForPath={conflicts.blockCountForPath}

src/contexts/AppStateContext.tsx

@@ -50,6 +50,10 @@ export type AppContextValue = AppSidebarProps & {
   autoOpenConflictResolverPath?: string | null;
   onAutoOpenConflictResolverConsumed?: () => void;
   onOpenConflictResolverForPath?: (path: string) => void;
+  onConflictMergeContinue: () => void;
+  onConflictMergeAbort: () => void;
+  onConflictRebaseContinue: () => void;
+  onConflictRebaseAbort: () => void;
 };
 
 export const AppStateContext = createContext<AppContextValue | null>(null);