From 674bd2c313e8436e7286b9bd9483d5c03967e0f6 Mon Sep 17 00:00:00 2001 From: Sam Chau Date: Tue, 19 Nov 2024 02:06:09 +1030 Subject: [PATCH] fix: refresh git status after resolving conflict --- .../src/components/settings/git/modal/ResolveConflicts.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/settings/git/modal/ResolveConflicts.jsx b/frontend/src/components/settings/git/modal/ResolveConflicts.jsx index dbe1692..c9a74d4 100644 --- a/frontend/src/components/settings/git/modal/ResolveConflicts.jsx +++ b/frontend/src/components/settings/git/modal/ResolveConflicts.jsx @@ -399,10 +399,14 @@ const ResolveConflicts = ({ try { const result = await resolveConflict(resolutions); - Alert.success('Successfully resolved conflicts'); if (result.error) { Alert.warning(result.error); + return; } + + Alert.success('Successfully resolved conflicts'); + await fetchGitStatus(); // Add this to refresh the status + onClose(); // Close the modal after successful resolution } catch (error) { Alert.error(error.message || 'Failed to resolve conflicts'); }