ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-03-19 22:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Resolve git operation error handling and conflict detection issues

Browse Source
This commit is contained in:
gsxdsm
2026-02-18 23:03:39 -08:00
parent 205f662022
commit a144a63c51
8 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/server/src/services/branch-utils.ts
View File

@@ -127,8 +127,8 @@ export async function popStash(
cwd: string
): Promise<{ success: boolean; hasConflicts: boolean; error?: string }> {
try {
await execGitCommand(['stash', 'pop'], cwd);
// If execGitCommand succeeds (zero exit code), there are no conflicts
await execGitCommandWithLockRetry(['stash', 'pop'], cwd);
// If execGitCommandWithLockRetry succeeds (zero exit code), there are no conflicts
return { success: true, hasConflicts: false };
} catch (error) {
const errorMsg = getErrorMessage(error);