git-sync/profilarr
1
0
Fork 0
mirror of https://github.com/Dictionarry-Hub/profilarr.git synced 2026-01-30 14:20:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: refresh git status after resolving conflict

Browse Source
This commit is contained in:
Sam Chau
2024-11-19 02:06:09 +10:30
parent 529072dc6c
commit 674bd2c313
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/settings/git/modal/ResolveConflicts.jsx
View File

@@ -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');
}