@@ -9,14 +9,7 @@ import { exec, execFile } from "child_process"
99import * as path from "path"
1010import { promisify } from "util"
1111
12- import type {
13- BranchInfo ,
14- CreateWorktreeOptions ,
15- MergeWorktreeOptions ,
16- MergeWorktreeResult ,
17- Worktree ,
18- WorktreeResult ,
19- } from "./types.js"
12+ import type { BranchInfo , CreateWorktreeOptions , Worktree , WorktreeResult } from "./types.js"
2013
2114const execAsync = promisify ( exec )
2215const execFileAsync = promisify ( execFile )
@@ -233,128 +226,6 @@ export class WorktreeService {
233226 }
234227 }
235228
236- /**
237- * Merge a worktree branch into target branch
238- */
239- async mergeWorktree ( cwd : string , options : MergeWorktreeOptions ) : Promise < MergeWorktreeResult > {
240- const { worktreePath, targetBranch, deleteAfterMerge } = options
241-
242- try {
243- // Get the worktree info to find its branch
244- const worktrees = await this . listWorktrees ( cwd )
245- const worktree = worktrees . find ( ( wt ) => this . normalizePath ( wt . path ) === this . normalizePath ( worktreePath ) )
246-
247- if ( ! worktree ) {
248- return {
249- success : false ,
250- message : "Worktree not found" ,
251- hasConflicts : false ,
252- conflictingFiles : [ ] ,
253- }
254- }
255-
256- const sourceBranch = worktree . branch
257- if ( ! sourceBranch ) {
258- return {
259- success : false ,
260- message : "Worktree has detached HEAD - cannot merge" ,
261- hasConflicts : false ,
262- conflictingFiles : [ ] ,
263- }
264- }
265-
266- // Find the worktree that has the target branch checked out
267- const targetWorktree = worktrees . find ( ( wt ) => wt . branch === targetBranch )
268- const mergeCwd = targetWorktree ? targetWorktree . path : cwd
269-
270- // Check for uncommitted changes in source worktree
271- try {
272- const { stdout : statusOutput } = await execAsync ( "git status --porcelain" , { cwd : worktreePath } )
273- if ( statusOutput . trim ( ) ) {
274- return {
275- success : false ,
276- message : "Source worktree has uncommitted changes. Please commit or stash them first." ,
277- hasConflicts : false ,
278- conflictingFiles : [ ] ,
279- sourceBranch,
280- targetBranch,
281- }
282- }
283- } catch {
284- // Continue if status check fails
285- }
286-
287- // Ensure we're on the target branch
288- await execFileAsync ( "git" , [ "checkout" , targetBranch ] , { cwd : mergeCwd } )
289-
290- // Attempt the merge
291- try {
292- await execFileAsync ( "git" , [ "merge" , sourceBranch , "--no-edit" ] , { cwd : mergeCwd } )
293-
294- // Merge succeeded
295- if ( deleteAfterMerge ) {
296- await this . deleteWorktree ( cwd , worktreePath , false )
297- }
298-
299- return {
300- success : true ,
301- message : `Successfully merged ${ sourceBranch } ${ targetBranch } ,
302- hasConflicts : false ,
303- conflictingFiles : [ ] ,
304- sourceBranch,
305- targetBranch,
306- }
307- } catch ( mergeError ) {
308- // Check for merge conflicts
309- try {
310- const { stdout : conflictOutput } = await execAsync ( "git diff --name-only --diff-filter=U" , {
311- cwd : mergeCwd ,
312- } )
313- const conflictingFiles = conflictOutput . trim ( ) . split ( "\n" ) . filter ( Boolean )
314-
315- // Abort the merge to leave repo in clean state
316- await execAsync ( "git merge --abort" , { cwd : mergeCwd } )
317-
318- return {
319- success : false ,
320- message : `Merge conflicts detected in ${ conflictingFiles . length } ,
321- hasConflicts : true ,
322- conflictingFiles,
323- sourceBranch,
324- targetBranch,
325- }
326- } catch {
327- // If we can't get conflicts, just report the error
328- const errorMessage = mergeError instanceof Error ? mergeError . message : String ( mergeError )
329-
330- // Try to abort any in-progress merge
331- try {
332- await execAsync ( "git merge --abort" , { cwd : mergeCwd } )
333- } catch {
334- // Ignore abort errors
335- }
336-
337- return {
338- success : false ,
339- message : `Merge failed: ${ errorMessage } ,
340- hasConflicts : false ,
341- conflictingFiles : [ ] ,
342- sourceBranch,
343- targetBranch,
344- }
345- }
346- }
347- } catch ( error ) {
348- const errorMessage = error instanceof Error ? error . message : String ( error )
349- return {
350- success : false ,
351- message : `Merge failed: ${ errorMessage } ,
352- hasConflicts : false ,
353- conflictingFiles : [ ] ,
354- }
355- }
356- }
357-
358229 /**
359230 * Checkout a branch in the current worktree
360231 */
0 commit comments