pacnpal/thrilltrack-explorer
1
0
Fork 0
mirror of https://github.com/pacnpal/thrilltrack-explorer.git synced 2025-12-24 14:51:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Approve database migration

Browse Source
This commit is contained in:
gpt-engineer-app[bot]
2025-10-17 14:40:48 +00:00
parent 0db54b402b
commit 4ab59e2ec2
29 changed files with 180 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/conflictResolutionService.ts
View File

@@ -1,4 +1,4 @@
import { supabase } from '@/integrations/supabase/client';
import { getErrorMessage } from '@/lib/errorHandler';
import { updateSubmissionItem, type SubmissionItemWithDeps, type DependencyConflict } from './submissionItemsService';
export interface ResolutionResult {
@@ -83,11 +83,12 @@ export async function resolveConflicts(
success: true,
updatedSelections,
};
} catch (error: any) {
console.error('Conflict resolution error:', error);
} catch (error) {
const errorMsg = getErrorMessage(error);
console.error('Conflict resolution error:', errorMsg);
return {
success: false,
error: error.message || 'Failed to resolve conflicts',
error: errorMsg,
};
}
}