fix: version control panel - show correct state when a push is reject…

…ed (#23)
The-Savvy-Tech · Feb 6, 2024 · 6e514f2 · 6e514f2
1 parent 8a88290
commit 6e514f2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...odl-editor/src/editor/src/views/panels/VersionControlPanel/components/GitStatusButton.tsx b/...odl-editor/src/editor/src/views/panels/VersionControlPanel/components/GitStatusButton.tsx
@@ -324,6 +324,11 @@ export function GitStatusButton({ openGitSettingsPopout }: GitStatusButtonProps)
             });
           } else {
             ToastLayer.showError('Failed to push. ' + error);
+
+            // If the error is a rejected push, we need to fetch again to get the latest state where we can pull and rebase
+            if (error?.toString().includes('rejected')) {
+              await fetchRemote();
+            }
           }
 
           return;