ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-03-21 11:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Standardize event name and import path

Browse Source
This commit is contained in:
gsxdsm
2026-02-18 11:21:43 -08:00
parent 5c441f2313
commit 6903d3c508
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/server/src/routes/worktree/routes/rebase.ts
View File

@@ -98,7 +98,7 @@ export function createRebaseHandler(events: EventEmitter) {
}); });
} else { } else {
// Emit failure event for non-conflict failures // Emit failure event for non-conflict failures
events.emit('rebase:failed', { events.emit('rebase:failure', {
worktreePath: resolvedWorktreePath, worktreePath: resolvedWorktreePath,
branch: result.branch, branch: result.branch,
ontoBranch: result.ontoBranch, ontoBranch: result.ontoBranch,

2
apps/server/src/services/merge-service.ts
View File

@@ -5,7 +5,7 @@
*/ */
import { createLogger } from '@automaker/utils'; import { createLogger } from '@automaker/utils';
import { createEventEmitter } from '../lib/events'; import { createEventEmitter } from '../lib/events.js';
import { execGitCommand } from '../lib/git.js'; import { execGitCommand } from '../lib/git.js';
const logger = createLogger('MergeService'); const logger = createLogger('MergeService');