ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-03-18 22:33: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

6
apps/server/src/services/pull-service.ts
View File

@@ -16,8 +16,8 @@
*/
import { createLogger, getErrorMessage } from '@automaker/utils';
import { getConflictFiles } from '@automaker/git-utils';
import { execGitCommand, execGitCommandWithLockRetry, getCurrentBranch } from '../lib/git.js';
import { execGitCommand, getConflictFiles } from '@automaker/git-utils';
import { execGitCommandWithLockRetry, getCurrentBranch } from '../lib/git.js';
const logger = createLogger('PullService');
@@ -359,7 +359,7 @@ export async function performPull(
// 9. If pull had conflicts, return conflict info (don't try stash pop)
if (pullConflict) {
return {
success: true,
success: false,
branch: branchName,
pulled: true,
hasConflicts: true,